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

* commit 'e3f8b31466f45eb4d5c9971049b71215a9f2c8a4':
  Zen: Improve zen mode panel condition selection.