am eb36b967: Conference call merge button visibility issue. (2/2)

* commit 'eb36b967255d32039b769ba0c78e982e988f7c1d':
  Conference call merge button visibility issue. (2/2)
tree: fb7014e7c00d67fd14d7c2a88655e1f70a72dcb8
  1. InCallUI/