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