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

Change-Id: I191b285ed3785f9937c91162d3aa875a285cb51a