Merge "Force disconnect when the surface is about to be saved." into nyc-dev