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