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