Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo