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