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