Merge "Defer the Surface.show until animation phase."