Merge "Fix a bug where conference call does not automatically resume."