Merge "Add more configuration state for visual voicemail" into nyc-mr1-dev