Merge "[Settings] Core refactor" into rvc-dev am: 1e5cf6525a
am: 94086bc8ac
am: e441218cda
am: bd810394a9
Change-Id: If2a5fc3d1196de704a59a35229dcb1690c2989f6
This commit is contained in: