Merge "Reduce video frame drop rate" into jb-dev