Merge \"Ensure conference doesn\'t support video if video conf not supported.\" into nyc-mr1-dev
am: 66b39eabbe

Change-Id: Iebced499505e18e33fde9da3641b0efa35d8d982