Merge "Remove ZEN notification visibility setting"