Merge "Fix 6470803 De-jank for video playback in fullscreen" into jb-dev