Merge "Fix divide by 0 for calculating vsyncs in buffer stuffing recovery" into main