Improve Settings launch performance am: 496d3f6f9c
am: edd86364f5

Change-Id: I1a90c8c49d6f226997e59b9af4518b93b7194e93