Merge commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5' * commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5': Don't force ended when full screen video is returned manually.
Merge commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5' * commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5': Don't force ended when full screen video is returned manually.