Merge "Add ability to disable video conferencing." into nyc-mr1-dev