Merge pull request #18664 from timdream/keyboard-settings

Bug 988782 - Allow keyboard settings page manages it's own life, r=rudyl
Merge pull request #19933 from EragonJ/bug-1014455

Bug 1014455 - The icons in SIM manager are incorrectly displayed r=Arthur
Bug 1023199 - Improve gallery flick test. r=vioia
Merge pull request #20258 from jonallengriffin/bug1023001

Bug 1023001 - Use * as maxVersion for b2gdesktop extensions, a=RyanVM
Port 1002593 to 1.4
Bug 1023694 - The integration test js/python all failed on 1.4 branch
Travis CI.
 - Stick to b2g30 for v1.4 branch.
Merge pull request #20331 from RudyLu/build/Bug1023694-stick_to_b2g30

Build/bug1023694 stick to b2g30.
r=yurenju.
Bug 1005823 - [Dialer] Fix emergency calls with no SIM card. r=rik
Merge pull request #20127 from DouglasSherk/1017831-intermittent-simsettingshelper

Bug 1017831 - Fix intermittently failing SimSettingsHelper._setToSettingsDB test. r=eragonj
Bug 1000337 - Correct notification title checking in integration test a=tests-only
Bug 974381 - Removing transition phase to improve responsiveness of homescreen edit mode
Merge pull request #20302 from viorelaioia/bug_1023199_v1.4

Bug 1023199 v1.4
Bug 960126 - Disable intermittent test on travis, Notification.get(): should work across domains
Merge pull request #20365 from julienw/1000337-v1.4-fix-notifications-test

Bug 1000337 - Correct notification title checking in integration test…
Merge pull request #20029 from davidflanagan/bug1020002

Bug 1020002: don't allow an activity choice that could subvert forward-lock(cherry picked from commit 5415cffccb81a637e4a9c225dce819b89e104933)

fix failing test
Merge pull request #20326 from russnicoletti/Bug-1002593-v1.4

Port Bug 1002593 to v1.4 r=djf
Bug 1014955 - [Camera] Migrate v1.3T downsampling patches to v1.4/master
Revert "Bug 960126 - Disable intermittent test on travis, Notification.get(): should work across domains"

This reverts commit fdf7605517f1859e4a28cfd490c057a0bfe6b17a.
Merge pull request #20247 from justindarc/bug1014955-v1.4

Bug 1014955 - [Camera] Migrate v1.3T downsampling patches to v1.4/master
Bug 1016897 - [Message]Previous saved draft will show up while entering edit new message view r=julienw

Conflicts:

	apps/sms/test/unit/thread_ui_test.js