Improve Settings launch performance
am: 496d3f6f9c

Change-Id: I16eb11d8850cbd75dd3571d16fce5758e5280bfd