Merge "Video editor API update - rework for Patch Set 3" into honeycomb