Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936 am: 91f2c3d931 am: b4c2f8c4d9 am: 45dbbfa3fd am: d14beedc47
Change-Id: I0fbef3f515db6a9413b49fcd046a11863a2db353
This commit is contained in: