Merge "TIF: Unbind the service only when it is bound"