Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799

Change-Id: I0e5602e0ad69b980cde0de231d30bb77595637d6