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