Merge "Make the dock orientation override the HDMI orientation." into ics-mr1