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

* commit '8eb9cd1610f23eef1d1166b8909db205021052c2':
  DO NOT MERGE Fix for in-call dialpad not sliding full length of screen
tree: fba86ed96a817e479f6b7c8ff34e39b467be5925
  1. InCallUI/