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