Bug 1077258 - Intermittent test failure - Fix FTU test
Bug 1043762 - Volume buttons don't do anything in Settings and previewing new ringtones
Bug 1087026 - [2.1][l10n][cost control] Multiple locales: the line "use data alert" is overlapped by the toggle switch
Bug 1091137 - [ringtones] Fix clearing out the tonePlayer's state when hiding the app

Conflicts:
	apps/ringtones/js/tone_player.js