Merge "Account for race condition when attaching HDMI." into honeycomb-mr1