Merge "Correct naming issues with video calling carrier config items." into nyc-dev