Merge "Zen: Fix recent regression in mode selection after reboot." into lmp-dev