Merge "Add flag to guard if a user can see call failure error message if 2G is off" into main