Merge "Fix presentation sizes for CTS video assets." into gingerbread