Merge "Don't unbind services unnecessarily." into nyc-dev