Merge "Always unbind before rebinding service"