Merge "Fix NotificationLockscreenPreference" into nyc-dev