Merge "Redial on the other slot upon radio disconnect" into nyc-mr1-dev