Merge "Add back button to dialpad in callui" into nyc-dev
am: 2ff80ef65a

* commit '2ff80ef65ad1856c766cdd6c2e311dc4c7e19318':
  Add back button to dialpad in callui