Merge "Delay rendering into Surface until draw completed."