Merge "Fix merge button is shown after reaching maximum conference call size" am: 53318b0a45
am: 77cb19fd9d

Change-Id: I8a248b4ae6be8a9ed9933d5e6edfe8ffb3ccd133