Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6
am: 004301ca4e
am: d389bc1cb4
am: ec277b8169
am: d99c69104f
Change-Id: Ibc78a6a7958532aee03ab4d77d3c69536016dac2
This commit is contained in: