Improve Settings launch performance
am: 496d3f6f9c

Change-Id: I5256fa0c04af07108b76cf21e9558b03d499e883