Merge "Adds security challenge when changing notification settings from lock screen" into nyc-dev