Merge "Verify ringtone from ringtone picker is audio" into tm-dev