Merge "Never "save" if the surface control is null." into nyc-dev