Merge "Fix issue #7966357: Super lights out mode vs. volume dialog"