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

Change-Id: I7c15f95b09ec0d79a36981ad6bb43d8faf9b7a48