Merge "Reorganize folders in omtp visual voicemail to make more sense." into mnc-dev