Merge "Allow same displayId to override DisplayRotationCoordinator callback" into main