Merge "Centralize rotation control to DisplayRotation"