Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
am: 403c8aa4ee
am: 1afdc562db
am: 091a0ebc85
Change-Id: I44d384f264e601ba8c32e43e99f36bece0549e75
This commit is contained in: