Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev