am dfa69d70: am 7ea55631: am 27565019: am 495a8172: am c3f986b5: Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev

* commit 'dfa69d703ab1ed0bb3137d3d13f0df830b7b7a24':
  Conference call merge button visibility issue. (1/2)