Merge "Fix voicemail tab showing even after being disabled." into nyc-dev