Merge "Fix issue where voicemail number is not saved properly"