Merge "Adding search tones" into lmp-preview-dev