Merge "Ensure conference doesn't support video if video conf not supported." into nyc-mr1-dev