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: dccc6751 am: ef5af77e
Change-Id: Ica87435299ebf649d8f3097e8c8f835e8ee56f28