Merge "Zen mode condition selection updates."