* commit '183cd9947e19d19e635db8912112bdaf81be9db8': Zen: Fix recent regression in mode selection after reboot.