Merge "Per-power group sleep and dim timeout" into main