Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev