Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961 am: 0987923594 am: 209d3699b5 am: c827609e3e am: 9df1698cea am: a39f58ae89
Change-Id: I166eaf66087c69a957e015518992f658de4ca927
This commit is contained in: