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