Bug 951284 - Do not dispatch appopen when app is not active
Bug 957906 - [fugu][buri][settings] cannot backward from keyboard settings
Bug 950207 - [Email][V1.3][POP3] The attachment disappears when first time to open a mail. r=asuth
Merge pull request #15274 from mcav/fix-disappearing-attachments-v1.3

Bug 950207 - [Email][V1.3][POP3] The attachment disappears when first time to open a mail. r=asuth a=1.3+
Merge pull request #14957 from crh0716/909266

Bug 909266 - Add settings helper for roaming perference r=alive, jaoo(cherry picked from commit 3b603d6adb6b92df347f953e22e4c5f35927c97d)

Conflicts:
	apps/settings/index.html
Merge pull request #14831 from mpizza/Bug_937487_handle_activity

Bug 937487 - Keyboard won't disappear after focusing an input and then l... r=alive.
(cherry picked from commit e8dfed06a8524c0d72c0c96c83341562754164fc)
Merge pull request #15285 from mpizza/Bug_937487_v1.3

Merge pull request #14831 from mpizza/Bug_937487_handle_activity
Bug 948226 - Activity orientation lock order

Conflicts:
	apps/system/test/unit/activity_window_test.js
Merge pull request #15251 from EverythingMe/959134-offline-session-init

[Bug 959134] Fix first-use offline searching [r=ranbena]
Merge pull request #15239 from mpizza/Bug_957906_v1.3

Bug 957906 - [fugu][buri][settings] cannot backward from keyboard settings. r=rudyl, arthurcc.
Merge pull request #15189 from alivedise/bugzilla/951284_v1.3/incorrect-appopen

Bug 951284 - Do not dispatch appopen when app is not active, r=timdream, a=1.3+
Merge pull request #14836 from EragonJ/bug-948847

Bug 948847 - [Gaia] add AirplaneModeHelper to make sure settings app and system app will not do the same thing
(cherry picked from commit 1bd937c8c110788fcaec7deefe5f3367def18a42)