Merge "Enhancements to conference for non-conference host scenarios." into qt-dev