Bug 838110 - made pick.js testable
Bug 838110 - load list.json to get wallpaper list
Bug 838110 - Wallpaper and ringtones customization

Conflicts:
	build/utils.js
Bug 838110 - fallback to filename when l10n of ringtone unavailable
Merge pull request #8263 from yurenju/wallpaper-v1.0.1

Wallpaper v1.0.1
Merge pull request #8228 from jmcanterafonseca/fix_contacts_orderby

Bug 843516 - Bug 841693 landed with an incorrect sortBy due to an unnece...(cherry picked from commit 11b59611e622e2cad4f68f398699b9b64ef7e228)
Bug 843660: Load settings values for subpanels too. r=etienne
(cherry picked from commit 0cacf1a7e57baaf5d6698c98a4dd8c7041d8d4ae)
Merge pull request #8057 from vingtetun/839472

Bug 839472 - Do not call canGoBack/canGoForward for non wrapper frames. ...(cherry picked from commit 1a25dbc6a64e898355e5b137017af846bbd948a5)
Bug 842091: Prevent flickering when transitioning to cards view. r=alive,timdream
(cherry picked from commit 22e926333fdd1467ebaace0f835aedc721c06fc9)
Bug 843762: Prevent multiple requests for the SMS DB. r=ehung
(cherry picked from commit 949a0eed6cb28bfcd9a943effef96e356ca83ebf)
Merge pull request #8239 from RudyLu/fte/date_time_init_country

Bug 835744 - [FTE] Init the Region/Country info correctly. r=timdream, a=blocking-b2g:tef+(cherry picked from commit e2d687965dfb99e03378c28b56a546de496e504a)
Merge pull request #8178 from gtorodelvalle/dialer-bug-832841-missed-call-notification

Bug 832841 - [OPEN_] When save a contact which has no name in contacts, it shows abnormal in call log and in notification.(617001973097).(cherry picked from commit f870d4eda2557ab7d3f56a45b1d94db3aabfa74c)
Bug 838993 - Temporarily disable failing tests r=julienw

These unit tests are currently failing and have been temporarily
disabled as per Bug 838993. They should be fixed and re-enabled
as soon as possible.

The following bugs track the process of re-enabling:

- Bug 838622 - [Dialer] USSD unit tests are failing
- Bug 840489 - [calendar] Fix failing unit tests
- Bug 840493 - [gallery] Fix failing unit tests
- Bug 840495 - [keyboard] Fix failing unit tests
- Bug 840497 - [sms] Fix failing unit tests
- Bug 840500 - [system] Fix failing unit tests
- Bug 841045 - [contacts] Fix failing unit tests
(cherry picked from commit 1c853f124b869218c88a1452377fd9c1dedb23bd)

Conflicts:

	apps/calendar/test/unit/views/month_test.js
(cherry picked from commit 96dffe8cdb68205e8475a8bd10f455c5a7ccfaff)
Merge pull request #8166 from dominickuo/bug-841972

Bug 841972 - [music] use CSS to position and clip album art on mix page(cherry picked from commit 3d14b28f958f4fe9735bdef5dfde7ba9c8e03f43)
(cherry picked from commit b9f0f11b265f23adabbc1391a53da757e5200e9d)
Merge pull request #8216 from albertopq/issue-842983

[Bug 842983] Facebook unit tests back to life(cherry picked from commit dd32a75aa766590d1f419f2ee2c773d77001f01f)

Conflicts:

	apps/communications/contacts/test/unit/mock_fb.js
(cherry picked from commit 4a6e3dee297aa9c8391e96484299c3843ae8c64b)
Merge pull request #8110 from vingtetun/840627

Bug 840627 - Icons in the settings app takes 200ms in the startup time. ...(cherry picked from commit e324e749cfd7ccbf7b0345d3f171dba5c8c695e9)

Merge pull request #8185 from etiennesegonzac/bug-840627-followup

Bug 840627 followup - moving the icons 1px up, 1px to the right(cherry picked from commit b5ef5ba42d3f867138334e69037f1c569533a949)
(cherry picked from commit aa103c97804cc24d9ff3a6b2cccba45c0d7c4525)
Merge pull request #8158 from borjasalguero/restore_unit_test_sms

Bug 840497 - [SMS] Fix & restore Unit Tests r=julienw(cherry picked from commit bf98de3a646e140952849da0f0c411cbd3d7c50e)
Bug 842862 - Emergency call l10n
Merge pull request #8313 from alivedise/bugzilla/842862_v1.0.1/l10n-emergency-call

Bug 842862 - Emergency call l10n, r=timdream+l10n, a=blocking-b2g:tef+
Bug 844168 - Don't rely locationchange event to show popup