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