Merge "Show even fewer notifications in Setup." into jb-dev