Avoid flicker during BFI and slow-motion or pause
Merge pull request #915 from mprobinson/master

Avoid flicker during BFI and slow-motion or pause