Merge pull request #9271 from samjoch/bug-859284-VideoPlayerAfterCompletionOfVideoPlaying

Bug 859284 - [Video Player] after completion of video playing in landsca... r=djf(cherry picked from commit 9947ab827649f9dc7b0a4c4e796fefb5c02d64dd)
Merge pull request #9659 from davidflanagan/bug859284-v1-train

Merge pull request #9271 from samjoch/bug-859284-VideoPlayerAfterComplet...