Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev