Merge "Notification lock screen setting updates"