Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8
am: 558095e583
am: d6b3dae0a6
am: 51e405d39c
am: 735d8d80cb
Change-Id: I38c09c8ecfb35f334b4b033397a0add4cc5ddfa2
This commit is contained in: