Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb