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

Change-Id: I45535471004baf0a6e329c4f3f44374e048a6e3e