Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread