Merge changes I93374f42,I0a1ae320 into sc-v2-dev

* changes:
  Apply screen off brightness clamp when going to sleep.
  Improve brightness handling during screen off timeout.