Merge pull request #14525 from karlt/942751

bug 942751 - stop OscillatorNodes when done to work around bug 897796 r=etienne
(cherry picked from commit 577f46a9a8f3f16540c007fa420bd5630c5f2ae3)
Bug 924843 - Icons on grid do not re-arrange automatically when dragging over collections

(cherry picked from commit 0294f589b11ad5f53250f8713fb82f59e55c0fcc)
Merge pull request #14567 from jmcanterafonseca/fix_export_sim_948862_master

Bug 948862 - [Contacts] The first time exporting a contact to SIM create...
(cherry picked from commit 3b59454125a4535ca26cc5f478a9073393d374f9)
Merge pull request #14542 from punamdahiya/Bug947028

Bug 947028 - Fix of overlapping checkboxes while selecting ring tones r=davidflanagan
(cherry picked from commit dea74850442df6aff8405333a973d49a9f1af2ec)
Merge pull request #14564 from EragonJ/bug-948769

Bug 948769 - [Settings][DSDS] Default service ID should be a number
(cherry picked from commit dc063ebf9efe13e341dda2b4d93da7fd34d8d4d4)
Merge pull request #14605 from EverythingMe/949392-music2

Bug 949392 - [e.me] 'Music2' removed from 'Music' collection when adding a web app [r=ranbena]
(cherry picked from commit 60fdc90f3463f5327d889c7caa2b5f1c8bf0abf2)
Merge pull request #14624 from timdream/statusbar-animation-icon

Bug 946173 - Update and remove unused and duplicate status bar icon files, r=alive
(cherry picked from commit ca82b55fe4b93b7706836406d91bc87e5dca89e5)
Merge pull request #14596 from steveck-chung/DSDS-sim_switch_for_MMS

Bug 949326 - [DSDS][MMS] Switching data call follow-up fixing for default service ID type changes, r=julienw
(cherry picked from commit 3190875284dd76bb98e4e7386edcf91573d25e7e)
Merge pull request #14630 from snowmantw/issue948789

Bug 948789 - Lockscreen can be unlocked without using normal gestures
(cherry picked from commit b34f90f2e213a901cd2aec00342dafd3d4af6960)
Merge pull request #14497 from rnowm/FB-header

Bug 946775 - [contacts][facebook] When importing contacts, blue facebook...
(cherry picked from commit 1224458b1ae7671cba7df000f295a771a62966db)
Merge pull request #14546 from karlt/943138

bug 943138 - improve dialer ADSR envelope r=etienne
(cherry picked from commit 3330e45ecd79a12241663db8bd1799cdfccd1451)
Merge pull request #14581 from gtorodelvalle/contacts-bug-938261-contact-update-activity

Bug 938219 - [Contacts] Unable to select a contact via the contact update activity (r=jmcanterafonseca)
(cherry picked from commit 390b313a254a947d12e3cdbcde19d7d1619ff63c)
Merge pull request #14645 from jmcanterafonseca/fix_flush_final2

Bug 949422 - If a Facebook Friend is removed (from the import list), the...
(cherry picked from commit 1c0e45902d5203232ad339b1ba53f8a52bb962a6)
Merge pull request #14463 from julienw/946678-use-href-for-activity

Bug 946678 - [Messaging] Creating a new message from contacts does not o...
(cherry picked from commit 9bc5f1fd67b42404db3e80e7ef5eb8b9f0802c59)
Merge pull request #14658 from lissyx/bug950070

Bug 950070 - Perform correct localization of the roaming notifier on lockscreen r=kaze
(cherry picked from commit ff5a87e8c13c14d14f04ce912b473c199f4ab870)
Merge pull request #14622 from rnowm/942907

Bug 942907 - asterisk * sign for favorites wraps into main space with long contact names
(cherry picked from commit e2e7add56f545f2086ab15525ba20b111e5e386f)
Merge pull request #14616 from jaoo/946299

Bug 946299 - Enable strict7bit enconding for a new market. r=kaze
(cherry picked from commit 358cd74fd2b2ef5d541f71a5d53d65d6a7335424)
Merge pull request #14701 from jaoo/946309

Bug 946309 - Include operatorsizelimit for MMS in a new market. r=kaze
(cherry picked from commit b34c6d84d26f06168107e6214a70eacdd4f50104)
Merge pull request #14685 from timdream/settings-back

Bug 947033 - Allow Settings to be called by activity without being a dialog, r=rudyl,arthurcc
(cherry picked from commit de298a34c9673098665d44ce361f402f6c2b8a16)
Bug 917674 - [Contacts] Passive matching and merging when SIM contact's name is the same than an addressbook contact's last name

(cherry picked from commit 241d2237e2c4f5876d0ef3ec3906b993e39dbdd7)