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