Merge "Ensure surfaces only resize during relayout." into nyc-dev