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

* commit '25c55157c416fcd8371f691bb6aa1e47d5d2a62d':
  Add back button to dialpad in callui