Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev