Merge "Surface should not be created for WindowContext initially." into rvc-dev am: 4346998c am: 03e13aa7 Change-Id: I5c404176daf6e84a3bd7aceccf7abb6c4328d34d