Merge "Move zen description to ZenModeConfig"