Merge "Don't hold clients lock while initializing Ringtone." into udc-dev