Merge "app_voicemail: Don't delete mailbox state unless mailbox is deleted"