am c3f986b5: Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev

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