Merge pull request #16496 from jimporter/ringtone-pick

Bug 953093 - [Fugu][File upload selector] Choosing the system ringtones will go back to the webpage; r=djf
(cherry picked from commit 043b24fbe6f79bc3c0785717a8143eb27833f721)