Merge "Zen mode updates."