am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0

* commit '6f13adb22afcb47a1cd45a90eaa3c154522089d4':
  Don't hold onto the lock while reconnecting to the server