Merge "Correct issue with auto disconnect conference where no participants." into sc-dev