am 261431a6: (-s ours) am 1f27ae72: am a53c9ced: Merge "Fix dialpad actionbar item heights" into klp-dev

* commit '261431a646f3eb3800a70d4d0f82e901481140cc':