Merge "[DO NOT MERGE] Improve brightness handling during screen off timeout." into sc-dev