am 433ea8ff: (-s ours) am b95a4c75: am 92ecd0f1: Merge "Hide dial button in-call so that in-call chooser dialog shows up" into klp-dev

* commit '433ea8ffde04771f641f5894edc1ad0a7e4c7660':