am 2e200ef7: (-s ours) DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio

* commit '2e200ef75541ee0f494877a42ae0e870799cc35c':
  DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio