Merge pull request #9406 from ian-liu/bluetooth/Bug817972_support_multiple_files_transferring

Bug 869287 - [Bluetooth][File-Transfer] Remove the transfer restriction on the number of files(cherry picked from commit d79dd6f33b3f13c55eeb968e36e066ba039bdbb4)
Merge pull request #10267 from steveck-chung/settings-mms-panel

Bug 877148 - Typo in message settings panel. r=evelynhung(cherry picked from commit 6de01b245fc1aa081021dcc7f8824cebf6abc7cf)
Bug 880813 - [MMS] Specify maximum allowed file size when invoking the "pick" MozActivity r=gnarf37
(cherry picked from commit 94b58b96098d0459e7ceb66e4a009debc55a0c45)
Merge pull request #10292 from huchengtw-moz/video/Bug_875726_Cannot_drag_the_indicator_to_any_place

Bug 875726 - [B2G][Gaia][V1.1.0_RIL][Video] Cannot drag the indicator to... r=@djf(cherry picked from commit 2bbae6bd0bf539656eba7e22e17765e1a90c9aa0)
Merge pull request #10153 from rexboy7/fix-bug873094

Bug 873094 - [Dialer] Cleanup exitCallScreen workaround during opening callScreen.(cherry picked from commit 8b80bb4093a40c5e09541f2a56a3f85847907052)
Merge pull request #10315 from daleharvey/880562

Bug 880562 - Dont request geolocation when in pick activity. r=djf(cherry picked from commit d21e066830787f85d4a1d53f2b62a5a5b124a056)
Merge pull request #9583 from jaoo/866003

Bug 866003 - [B2G][LEO][settings]Can not select AuthType of data profile. r=kaze(cherry picked from commit e620b1766b9c029e01067ef6cdd3e9e5fc6b15e6)
Merge pull request #10232 from gaye/bug-851003

Bug 851003 - Ensure that all events and busytimes get purged on account delete r=lightsofapollo(cherry picked from commit c7e704906372d397d26b7985866a1551d1650c1d)
Merge pull request #10231 from daleharvey/874796

Bug 874796 - Add setting to disable / enable cell broadcast alerts.(cherry picked from commit ed33f05e869945e12bb05ca94b56c2ce0dea25ef)
Merge pull request #10312 from crh0716/881193

Bug 881193 - Reset mute and speaker status at the first call(cherry picked from commit 2ab2aa0b0bd89d31eb497480749b812c00475a1e)
Merge pull request #10298 from arcturus/bug-880292

Bug 880292 - [Contacts] Gmail import is using a personal developer keys(cherry picked from commit 9aa39aae3440c1921636253ec62c1ac2d0fde861)
Merge pull request #10333 from lissyx/bug877141

Bug 877141 - Strip down non-break spaces from contenteditable

r=julien(cherry picked from commit 5db84b067d58b4825d4900cb66a0d10e0522a831)
Merge pull request #10319 from crh0716/871413_background

Bug 871413 - Use black as the default background to have better user experience(cherry picked from commit fd19c108f5d5661cd531eedacd303515ea466d63)
Merge pull request #10291 from ian-liu/mms/Bug877940_Animation_for_sending_should_not_show_while_editing_messages_list

Bug 877940 - [SMS] Animation for sending should not show when in Edit/Delete messages list(cherry picked from commit 44415e2deb3e752c7ea4cfc031039d26f9c18be1)
Merge pull request #10268 from fabi1cazenave/mmsThumbnails-bug876467

Bug 878042 - [MMS] image placeholder style, r=julienw(cherry picked from commit bad6ca6977451321f7528e02f320308b0a6fba53)
Merge pull request #10322 from lodr/bug-880215-check-config-before-processing

Bug 880215 - Adding some missing autoclose situations.
r=:arcturus(cherry picked from commit c98c017e4b3b1f91a4830a92b470d53631ca401d)
Merge pull request #10332 from mozsquib/settings-storage-name

Bug 880059 - External SD card storage listed as "internal" in Settings(cherry picked from commit 377b1e2b5339b4a8f44c7429b1007d86939c8ca9)
Merge pull request #10240 from RudyLu/dialer/Bug878184-BT_redial_master

Bug 878389 and Bug 878184 - support BT redialing the last... r=etienne, ferjm.(cherry picked from commit 6126d368e1ed379ca2c34bc3ae510bc859473d2e)
Merge pull request #10079 from julienw/863466-focus-buttons

Bug 863466 - [system] focus the alert/confirm/etc dialogs so that the ke... r=benfrancis r=alive(cherry picked from commit bee87c84899f432e9ed7a434ecb552ba8f610f6b)

Conflicts:
	apps/browser/index.html
Bug 880609 - Request wake lock failed after device is off and on.