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

Change-Id: If3549debf14046ce70d6a99eefc1ec23e87686dd