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

Change-Id: I7b59e572542449b54c835688cf8c9c0e2e5c74b0