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

Change-Id: I6d05a6652fc97f047fc20f6f2056a047fa2ff3c5