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