Merge "Reconnect to service when it is updated"