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