Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev