Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e am: fa54aab4d1 am: a9fad2e73d
Change-Id: I37becaec8153ed50b33b74487bd4536dafd92728
This commit is contained in: