Fix rendering desynchronization issue
Look at the commit messages for details.
This doesn't add any test but I am working on a qr-lipsync test that will be added in a following MR. This problem seems bad enough that we should get the fix out ASAP and have a release with it.