Merge "Allow enabling and disabling of visual voicemail through settings." into mnc-dev