Merge "WM part of #3293405: Screen needs to be redrawn when HDMI is plugged in" into honeycomb