Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e
am: 3ffe34a48b
am: 76b3da3eee
am: 21ca7a4348
am: 99aa7b79f4
Change-Id: I63fc278e0e264dc54940ede0970befb2c42ec311
This commit is contained in: