Handle alternating video streams a lot better.
Merge pull request #5165 from unknownbrackets/mpeg-minor

Handle alternating video streams a lot better
Update native
Re-enable screen rotation on Android.

This time, let's fix the issues that come up instead of reverting.