Bug 873844 - Load util.js before handling notification
Merge pull request #9746 from crh0716/861768

Bug 861768 - Remove overflow:inherit r=pivanov(cherry picked from commit 467f68eb2403364867baa4d6fdccf30426a7d400)
Merge pull request #9857 from asutherland/email-lastsync-fix

Bug 869817 - [Email] "Last Sync:" value at folder screen is not displayed properly with IMAP accounts. r=asuth(cherry picked from commit feee2701e8dc5d226331a5ce9682f2b61057b012)
Merge pull request #9637 from leob2g/Bug_870235_When_adding_only_a_picture_in_Add_contact_page_the_Done_button_is_enabled

Bug 870235 - [Contacts] When adding only a picture in 'Add contact' page, the 'Done' button is enabled.(cherry picked from commit 9c0f730f669aa105ba936a9a1afd5afe7f42b4cb)
Merge pull request #9681 from jmcanterafonseca/automatic_logout

Bug 861290 Unable to sign off from the e-mail account, after deleting pr...(cherry picked from commit acb7c244193ca83dae0d6815d1c683129d2002da)

Conflicts:
	apps/communications/contacts/oauth2/js/parameters.js
Fixing uplift for bug 861290
Merge pull request #9890 from alivedise/bugzilla/873844_v1-train

Bug 873844 - Load util.js before handling notification, r=fabrice
Merge pull request #9596 from gtorodelvalle/dialer-bug-869446-fix-call-log-filters

Bug 869446 - [Dialer][BB] Adapting the Call Log filters to the latest up dates in the Tab BB (r=crdlc)(cherry picked from commit b2026cc332c8cd9f3e602367aca3421686740ab6)
Merge pull request #9615 from lodr/bug-869485-remove-unnecessary-styles

Bug 869485 - Removed unnecessary styles.
Cause r+(cherry picked from commit 2991e9f9177fc10f56b17ce209302c9476d9a593)
Merge pull request #9502 from gaye/bug-867040

Bug 867040 - Tap to create event on calendar day and week views(cherry picked from commit 9547f81c98f77c58e4d2d52c91906d1845f7cf81)
Merge pull request #9821 from daleharvey/camera-squash

Bug 866790 - Set te preview size to match the picture size aspect ratio. r=djf(cherry picked from commit a80a08c71f111344fda673f1a2b6475484f6efa4)
Merge pull request #9860 from daleharvey/fix-lint

Bug 866790 - Follow up to fix lint errors. r=me(cherry picked from commit 292f6c2fba2729c81a304c65597ed20efca45d2e)
Merge pull request #9825 from lightsofapollo/alarms-hotfix

Bug 850850 - Add additional safe gaurds to ensure alarms fire r=kgrandon(cherry picked from commit 08c3ee81771299b4d8b5517da871bb2a08cc3647)
Merge pull request #9886 from KevinGrandon/lightsofapollo-oauth-clear

Bug 871894 - Clear cookies prior to displaying oauth2 r=kgrandon, gaye(cherry picked from commit 9578b27154645c390c41982f9d9a0113e46a6245)
Merge pull request #9658 from KevinGrandon/bug_867219_single_unlock_step

Bug 867219 - New lock screen implementation r=yuren(cherry picked from commit 83643d05ee93a0f0bb4b3d3239384736514a92d4)

Conflicts:
	apps/system/locales/system.ar.properties
	apps/system/locales/system.fr.properties
	apps/system/style/lockscreen/lockscreen.css
Merge pull request #9777 from askeing/Bug_867031

Bug 867031 - [CustomizeUI] Cannot preload contacts during build time, r=@timdream
Conflicts:

	Makefile
Merge pull request #9917 from askeing/v1-train

Merge pull request #9777 from askeing/Bug_867031
Merge pull request #9670 from ian-liu/clock/Bug869811_layout_of_mini_attention_screen_overlapping

Bug 869811 - [Clock] The alarm goes off page is broken and overlapping after attention screen switched between full/status bar mode. r=alive(cherry picked from commit ff3b6e1f3e2fa945903d94dd2ee99ec3a84f46cf)

Conflicts:

	apps/clock/style/onring.css
Merge pull request #9709 from ian-liu/clock/Bug869811_alarm_label_of_mini_attention_screen_is_overlapping_in_two_line

Bug 869811 - [Clock] The alarm goes off page is broken and overlapping after attention screen switched between full/status bar mode. patch2 r=alive(cherry picked from commit 393b3f57822ae0f34055c6a6060f1433136bafa0)

Conflicts:

	apps/clock/style/onring.css
Merge pull request #9778 from crdlc/bug-869309

Bug 869309 - [Homescreen] When pressing the app icon continuosly in home...(cherry picked from commit ec6e4178f3227f6adac6191855072a89b6bbc6a6)