Merge "Fix the issue the video can't start to play" into honeycomb-mr1