am b7acdfb8: Merge "Fix green or corrupted video frames in the exported movies" into jb-dev

* commit 'b7acdfb8068bf408ed859dfdd441b4a8722eb12a':
  Fix green or corrupted video frames in the exported movies