Merge "Surface should not be created for WindowContext initially." into rvc-dev am: 4346998c88

Change-Id: I846babc528406d492bb9a64fbb81c02c35dbba30