am e62fa825: Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog

* commit 'e62fa825794967c2067be86e8b57b83f4b82ee1c':
  Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog