Merge "Prevent launcher switching in Settings app." into lmp-dev