Merge pull request #10293 from RudyLu/keyboard/Bug852785-hideKeyboard_before_show_activityMenu

Bug 852785 - Hide keyboard before activity menu shows. r=alive(cherry picked from commit bd07ce233160a0e6325bf736769772a9d2273458)

Conflicts:
	apps/system/js/keyboard_manager.js
Merge pull request #10458 from Rik/disable-travis

Bug 884217 - Disable travis on v1.1.0hd r=yurenju(cherry picked from commit 48c005e720aaf810edc5d67ac2aa983dbbca47e1)
Merge pull request #9981 from vingtetun/notifications-lockscreen

Bug 868816 - Remove the notifications for the displayed app when we go o...(cherry picked from commit 6d11a1acab160b170081242290ae1bdebf0e022a)

Conflicts:
	apps/system/js/window_manager.js
Revert "Merge pull request #10223 from lightsofapollo/clean-removal-of-events"

This reverts commit 43c9be6643ca5a649b04baeb23e53bc71cfe005b.
Bug 883759 - Hangup the waiting call when receiving CHLD=0
Merge pull request #10128 from ian-liu/bluetooth/Bug832368_revise_title_for_device_selector_dialog

Bug 832368 - Dialog to pick bluetooth file-transfer recipient is really vague. 'Choose your option | [Cancel][OK]', r=@alivedise(cherry picked from commit b944fe64f811a243b2756a21a41ce22a863968d0)
Merge pull request #10297 from fcampo/sms-edit-empty

Bug 881259 - [SMS/MMS] Edit mode is active even when there is no message to delete
(cherry picked from commit 6bf641acd7f6e7b6481822dad46561f23038afc2)
Merge pull request #10314 from RudyLu/gallery/Bug880943-correct_init

Bug 880943 - Correctly init Gallery app regardless of the timing of r=davidflanagan
(cherry picked from commit 0e84ea18b9c161a08d39c39740ff2aa0f094d606)
Merge pull request #10365 from huchengtw-moz/video/Bug_881474_spinner_shows_forever

Bug 881474 - [video] with youtube video paused, dragging slider makes sp..., r=@djf, a=leo+
(cherry picked from commit 04572788297618592d9a6d690e1f9cf260542e90)
Merge pull request #10341 from jaoo/881645

Bug 881645 - Voice mail number for Costa Rica is not OK, r=kaze
(cherry picked from commit 41536df3c4f8d273776165a7fdb1297e11edde2b)
Bug 875408 - [MMS] Display unknown file types and corrupted attachments

(cherry picked from commit 1dfd7411a48e70e64b18a60ea5ace67e986b8d5a)
Bug 884639 - [SMS][MMS] Fix lint error caused by bug 875408 patch

https://bugzilla.mozilla.org/show_bug.cgi?id=884639

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit b22c9e7516688b0cf1709091032f7a94c5fd6195)
Merge pull request #10453 from davidflanagan/bug881239

Bug 881239: retain space or punctuation when reverting an auto-correction r=RudyLu
(cherry picked from commit f9372072b94a2579575ec45bfa29d97b9fff4b9a)
Bug 878735 - [SMS / MMS] entering new message screen not rendering correctly when accessed via contacts app - r=gnarf

Closes gh-10204

(cherry picked from commit 78b678d8c7e75d343b7127a21ada6baa9b875c1e)
Merge pull request #10485 from lodr/bug-882577-remove-connection-warning

Bug 882577 - Remove error message after successfully request
r=arcturus
(cherry picked from commit 3bc0a3153b1d1a4d64fe4ff7afa40679b3fa2867)
Merge pull request #10488 from lodr/bug-884764-store-chart-visibility-by-sim

Bug 884764 - Store chart visibility by SIM
r=arcturus
(cherry picked from commit a1d8b7a9079c3f22ee6dde41e71a722dba4667ba)
Merge pull request #10444 from ferjm/callloglimit2

Bug 829399 - Add a limit to the maximum number of calls logged inside th...(cherry picked from commit c74d0ee0692de0171af7b3a3f28b640a3f4fbec1)

Conflicts:

	apps/communications/dialer/js/call_log_db.js
	apps/communications/dialer/test/unit/calllog_db_test.js
Merge pull request #10405 from daleharvey/882175

Bug 882175 - Fix cellbroadcast settings UI to not display opposite of actual value. r=kaze(cherry picked from commit 5ad48f6c2ac80027e88e8d0c469686946e34a9cd)

Conflicts:
	apps/settings/index.html
	apps/settings/js/call.js
	apps/settings/js/settings.js
Merge pull request #10452 from davidflanagan/bug883250

Bug 883250: don't auto-punctuate after punctuation r=rudylu(cherry picked from commit cd68aa09fed7f8343b15a7f234e16b59ce562aea)
Merge pull request #10538 from davidflanagan/bug883250-v1-train

Merge pull request #10452 from davidflanagan/bug883250