Merge "Dynamic InCallService switching." into nyc-dev