Merge "[Settings] Refactor for performance" into rvc-dev am: cdab906c45
am: 0c7bad635f
am: 9a4480d887
Change-Id: Id8734a47ea50b753a8272bdf9c13c798e0d58863
This commit is contained in: