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)
Bug 860607 - Delete multiple SMS by calling mozMobileMessage.delete() directly. r=julienw
(cherry picked from commit cdc37c5b0580b0f97735555b3de5e1bdd9fda08f)

Conflicts:
	apps/sms/js/message_manager.js
Merge pull request #9276 from ssaroha/sms-notification-bug837029

Bug 837029 - [SMS] - Fix for SMS app attempts to show deleted sms from new message notification r=julienw(cherry picked from commit 23f0b698f96affd9242382178202bedb14bc91ad)
Bug 837029 - Text Change in the alert shown on deleted SMS if new message notification still exists r=julien
(cherry picked from commit c79b70526e676c880b4bbd293b97bb20a0e9eeb2)
Bug 868388 - [Building Blocks] Filters should be updated(cherry picked from commit 1c1aa726652d3c4b4e803beec11b07de0b6ba5f5)
Merge pull request #9806 from leob2g/Bug_872844_Clearing_input_fields_error

Bug 872844 - [Settings] Clearing input fields when enter wrong PIN code, r=kaze(cherry picked from commit e99e62ce2586c98ae491cccc9fe772f8cddf423b)
Merge pull request #9646 from eeejay/ignore-fake-clicks

Bug 870078 - Ignore scripted mouse events in desktop helper TouchEventHandler.(cherry picked from commit 768d0f0db2410008f5912904b51743f96b2f875b)
Bug 835991 - change an l10n ID to make sure the translations are updated (uplift)
Merge pull request #9937 from fabi1cazenave/l10n-crashReporting-bug835991-v1train

Bug 835991 - change an l10n ID to make sure the translations are updated - uplift
Merge pull request #9597 from ochameau/browser-helper

Bug 869540 - Split desktop-helper to segregate browser related feature out of it. r=@vingtetun(cherry picked from commit 93ecda33fac3349b8a7bbf80e5c16a01393a1be9)