Merge "Video editor CTS: Framework modifications" into honeycomb