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

Change-Id: Ia3079b04d63446c35e4397e2eb0c3f2c9f4f6bf9