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