Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev