Merge "Adding a config to hide the conference 'swap' button for USCC" into nyc-mr1-dev am: 3051301802 am: 5966c1ee14
am: 299da15ab5

Change-Id: Idd688051d81f67998cfe89f861ea0bcdd0f65f7c