Merge "Revert "Recompute the mNextFrameStartUnstuffed on every frame"" into tm-qpr-dev