Merge "Change screen lock preference UI"