Merge "Migrate Dial pad tones preference" into main