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