Merge "Fix delay used when polling for rendered buffers" into main