Merge "Merge "Surface should not be created for WindowContext initially." into rvc-dev am: 4346998c am: a8b98c6e" into rvc-d1-dev-plus-aosp