Merge "Remove contention from Render Engine early return" into main