Merge "Handle when non-emergency call fails and no 2G" into main