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 921404 - [Flatfish][Lockscreen] screen clock is too small on tablet
fix Bug 921404 uplift
Merge pull request #12758 from fcampo/retryCount-905173

Bug 905173 - PIN code screen should not display '3 tries left.' when loading (r=Rik)(cherry picked from commit 43091d1a13e4bbb2693f5238c80307fca36e2175)

Conflicts:
	shared/test/unit/mocks/mock_icc_helper.js
Bug 922582 - Remove the caller number when entering switch-calls mode r=etienne
Merge pull request #12856 from Neeraj-Seth/bug-890207_cursor_hide_issue

Bug 890207 - [B2G][Gaia][Keyboard][Auto-correction] If a wording include...(cherry picked from commit 37032f754c7186a9e7e1bf4e848db94ca2584a4c)
Bug 927062 - Remove the 'add call' button when in CDMA call waiting mode r=etienne
Bug 928394 - Remove test_homescreen_launch_here_maps.py from aurora
Bug 915081 - Hide the end-and-answer button during CDMA call waiting r=etienne

- Removed the end-and-answer button when in CDMA call waiting mode as it
  does not support ending the first call and answering the other one,
  the hold-and-answer button is enlarged to fill up the entire container
  under these conditions
- Added unit-tests covering the changes
Merge pull request #12322 from davidflanagan/autocorrect-config

Bug 884752: configure keyboard layouts and dictionaries at build time r=janjongboom,luke-chang,aus(cherry picked from commit 38456b0b9ee903e597d2a2fd949c10fd673e1993)

Conflicts:

	Makefile
	apps/keyboard/js/keyboard.js
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