Merge "Switch to speakerphone when upgrading to video" into nyc-mr1-dev