Merge "Surface should not be created for WindowContext initially." into rvc-dev