Merge "Changes to notification silencing controls."