Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout" into honeycomb