Merge "make the syncmanager keep track if whether a service has been unbound from so that it knows whether to call unbind at a later time"