Merge "Stop call waiting tone when call gets answered" into nyc-dev