Merge "Improve Settings launch performance am: 496d3f6f9c am: edd86364f5" into qt-r1-dev-plus-aosp
am: c2b7196945

Change-Id: I5f716f90db5fe97d7ea204a988ee90c1bb9771b1