Merge "Move ringtone lookup to background" into nyc-dev