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

Change-Id: I4fe2f9a2cbab4d46092274a94a1b9a15438f1b4c