Merge changes I9ab50a7a,I8a57b632

* changes:
  Do not show the voicemail tab if the VM toggle is turned off.
  Internal cleanup for the new UI's bottom sheet.