Merge "Revert^2 "Per-display group PowerManager APIs by default"" into main