Merge changes I20238912,I1fe1eef4

* changes:
  InCallActivity#isDialpadVisible() now returns the correct value.
  BEGIN_PUBLIC Automated rollback of changelist 172505648