Merge "Enhancements to conference for non-conference host scenarios." into qt-dev
am: 2d82b3e475

Change-Id: I88d824ba2fc9d1ba6376dbb0d1ba4c300b2472aa