Merge "Video Editor:Fix for 3375632" into honeycomb