Merge "Fix issue with auto disconnect on empty conference." into udc-dev