Merge "[Settings] Core refactor" into rvc-dev am: 1e5cf6525a
am: 14e8c6dba1
am: 5092e504fa
am: 629be6a8a8
am: eaadba4168
Change-Id: Ie6d7e61c5505c052b71f647d6cf62352f78f912d
This commit is contained in: