Merge "Delay sending Plugin Draw event until the surface is ready."