Merge "Reorder the new notification settings page" into sc-dev