Merge "[Settings] Refactor for performance" into rvc-dev am: cdab906c45
am: 0c7bad635f
am: ddaf65a3ae
am: 68a37b0eeb
Change-Id: I9ffdcc8923b6e4f925f7ebf9b03e492074761d32
This commit is contained in: