Merge changes from topic "b200851199" into sc-qpr1-dev

* changes:
  Make DisplayModeDirector aware of whether HBM is active
  Change DisplayModeDirector's brightness source to DisplayListener