Merge "Remove ZEN notification visibility settings"