Merge "No longer set CONFERENCE_HAS_NO_CHILDREN on SRVCC"