Fix movie playback issue on Simulator.
Merge branch 'simulator-fix'
Revert "Merge branch 'simulator-fix'"

This reverts commit fe3f5472b0ee5fececba4d9f1182fff675beae35, reversing
changes made to 94d937b37a3f11a372702ff33971457fb1a807cf.