Merge "VideoEditor:Fix for 3369908" into honeycomb