NEXT: Possibly fix Zen Mode to activate on Switch-in