Merge "Fix crash in ConfigureNotificationSettings" into nyc-dev