Merge "Maintain the seek position in HTML5 video" into honeycomb