Merge "allow override of HDMI rotation"