Merge "Wait for next available frame" into main