Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0