Merge changes I93303a2a,I00174f84

* changes:
  Make NUI VM avatar and icon consistent with nui call log
  Move HIDE_VOICEMAIL_SETTINGS_MENU out of voicemail/impl