2010-09-29 Mark Rowe Merge r67285. 2010-09-10 Jer Noble Reviewed by Simon Fraser. Movies with track or movie matrices don't display in