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

Change-Id: I01700637f72e3542810353a709bfe10bf5aff276