Merge "Notification settings updates"