Merge "Suppress conference initiation when already in the process of merging."...
Merge "Suppress conference initiation when already in the process of merging." into oc-dr1-dev am: a7d94e63
am: ea37c8a2
Change-Id: I9d000f90d39bc18e00ce8fc1931183ea6a0ca74b