Merge "remove code to resize status bar when on HDMI"