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

Change-Id: Ie1c199bbc721f282dc0de788d36481fef9530460