am 5d0ea3d8: am ca837aa0: resolved conflicts for merge of 9e1f62f0 to klp-modular-dev

* commit '5d0ea3d87caab371ca303037956b4d51159bbc6c':
  DO NOT MERGE Fix for in-call dialpad not sliding full length of screen
tree: 7c67abb754a48610ecfa88fb3dadaa3626211644
  1. InCallUI/