Merge "Reset binder during unbinding"