Merge "Limit creating new surface for legacy apps to size changes." into oc-dev am: d523125679
am: 80e1d8eb9a

Change-Id: If075db13918bc53ac4f51c3159b16582b0740fbe