Merge "[Settings] Move some work into background thread" into rvc-dev am: 7585e6ac1f
am: d68d156a80
am: e91ff4eac7
am: d3656710d0
Change-Id: If50208d980d2827d9b988c4a0560244d15846970
This commit is contained in: