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