Merge "Add new carrier config option for video conference support." into nyc-mr1-dev