Merge "New toggle for peoplehub in Notification settings"