Merge "[Settings] Avoid from crash" into rvc-dev am: 7ff5f56ea6
am: e96b23a251
am: d737972b80
Change-Id: Ia27abbe9c32f28727c0522118b0526d999d70c68
This commit is contained in:
7ff5f56ea6
am: e96b23a251
am: d737972b80
Change-Id: Ia27abbe9c32f28727c0522118b0526d999d70c68