Bug 924251 - fixing markup to use building blocks for offline overlay
Bug 927002 pin marionette python client to >= 0.6.0
Merge pull request #12784 from snowmantw/issue925635

Bug 925635 - [LockScreen] Fix the track to match the icons(cherry picked from commit 41334990d9b7cfbb9415916c23f6930f2ddf63dc)
Bug 928394 - Remove test_homescreen_launch_here_maps.py from aurora
Merge pull request #12947 from davidflanagan/bug884752-v1.2

Merge pull request #12322 from davidflanagan/autocorrect-config 
Uplifts bug 884752 to v1.2
Revert "Merge pull request #12947 from davidflanagan/bug884752-v1.2"

This reverts commit 8cbe9e4fe267f010bfa1e6a96837b600492d020c, reversing
changes made to 22b95ba3a4df0c2e69ac19a7300cb9d43085a860.
Merge pull request #12906 from snowmantw/v1.2

Merge pull request #12784 from snowmantw/issue925635
Merge pull request #12955 from EverythingMe/908057-hd-icons-1.1

[Bug 908057] Fix e.me icons for 1.1 HD [r=ranbena]
Conflicts:
	apps/homescreen/everything.me/modules/Apps/Apps.js
Merge pull request #12462 from dwi2/bug911010

Bug 911010 - [B2G][Helix][dialer][tongxiao]The emergency call Interface ... r=rik
(cherry picked from commit c3bb0282f306cfbb4112aedb835d676f4a965127)
Merge pull request #12899 from zacc/bug927002_v1.2

[v1.2] Bug 927002 pin marionette python client to >= 0.6.0
Bug 927404 - Fix reporting for failed gaiatest tests, r=dhunt, a=test-only

Conflicts:
	tests/python/gaia-ui-tests/setup.py
Merge pull request #12839 from mikehenrty/bug-924251-overlay

Bug 924251 - fixing markup to use building blocks for offline overlay, r=alive
Merge pull request #12281 from eeejay/bug-916231

Bug 916231 - Add screen reader toggle to developer options. r=kaze(cherry picked from commit c7803c6a23057cd3b3613f315d2fe5a5d4c83a51)
Merge pull request #12095 from eeejay/bug-914882

Bug 914882 - Style clipped settings panels as invisible. r=kaze(cherry picked from commit 4ef6ee9cc13709659537c51c06bdbdd6c2bbfea7)
Merge pull request #12424 from gasolin/issue-920042

Bug 920042 - [Flatfish] not minimize appWraper bar while swipe up to hom...r=alive(cherry picked from commit 3809802787e824684a144dc7a03e8795ce4f9f77)
Merge pull request #12498 from rnowm/Bug-920587

Bug 920587 - [BB] Confirm with content BB should properly support the absence of a <small> element(cherry picked from commit 340d6feca6ac508a06b1e6054449b2e0394b1812)
Merge pull request #12610 from snowmantw/issue921392

Bug 921392 - [LockScreen] Need to dark the icons of locksceen(cherry picked from commit 529a4d741df4867eaa2adf0aaeef0fb5015752b3)
Merge pull request #12622 from crdlc/bug-922185

Bug 922185 - [e.me] e.me search can find hidden apps(cherry picked from commit 53935ec1c61b5af7c2b51459bec3fcc0f0ca5004)
Merge pull request #12658 from Rik/polish-statusbar-921056

Bug 921056 - Visual polish for status bar r=etienne(cherry picked from commit f1c62186e214febd92b72c148289c48b4bcff204)
Merge pull request #12721 from gtorodelvalle/contacts-bug-904515-national-prefix-matchings

Bug 904515 - [Contact] Matching is not working when phone number is save d with prefix - highlighting part(cherry picked from commit e034881d8750f9a547c116e0812067784f8f65f1)