Merge pull request #25346 from KevinGrandon/bug_1085667_intermittent_ringtones_share_test

Bug 1085667 - [Music] Try clicking on share button mutliple times
Conflicts:
	apps/music/test/marionette/lib/music.js
Merge pull request #26434 from mikehenrty/bug-1085667-searchtimeout-for-ringtones

Merge pull request #25346 from KevinGrandon/bug_1085667_intermittent_rin...