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

* commit 'b0ce15d5ff364020f949cdd5a0738ea80ab61f3d':
  Conference call merge button visibility issue. (2/2)
tree: 7a6faca89632deca310aaeaecebd75486716fc2a
  1. InCallUI/