Merge "Update Security & screen lock preference"