Merge "Set max wait time if setVoicemailNumber is stuck" into main