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