Merge "Register OnHoldTone event" into nyc-dev