Merge "Fix clearing of voicemail notifications."