Merge pull request #14719 from lissyx/bug890440

Bug 890440 - Disable system workarounds for notification sent with the deprecated API r=alive
(cherry picked from commit b84aa4ba45f5f5e069bbc3b83270fc6e5d53bbd9)

Conflicts:
	apps/system/js/notifications.js
Merge pull request #17169 from mikehenrty/v1.3-uplift

Merge pull request #14719 from lissyx/bug890440, r=alive
Merge pull request #15466 from julienw/956276-duplicate-event

Bug 956276 - [ZTE]-Two or more instances of open activity will be launch...
(cherry picked from commit 73898bf32b3da33a0de96438302feb21635285aa)

Conflicts:
	apps/system/test/unit/notifications_test.js
Bug 983176 - [B2g][Contacts] Unresponsive done button while searching FB contacts
Merge pull request #17182 from crdlc/bug-983176-v2

Bug 983176 - [B2g][Contacts] Unresponsive done button while searching FB...
Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen
Merge branch 'v1.3' into v1.3t
Merge pull request #17197 from gtorodelvalle/v1.3-contacts-bug-972600-uplifting

Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen
Merge pull request #17208 from gregorwagner/tiling

Bug 972779 - [Tarako] Saving picture after editing cause Gallery stop. C...
(cherry picked from commit f3c4a2fc0cfbeccc9c595f06b436707fa2e6ca0a)
Merge pull request #17172 from jrburke/bug966147-email-notification-click-close

Bug 966147 - Email Notification doesnt go away when I click on it r=asuth
Merge pull request #16994 from mikehenrty/bug-979624-connecting

Bug 979624 - [B2G][Dialer][All languages] Performing a call while in a c..., r=etienne
Merge branch 'v1.3' into v1.3t
Bug 982530 - [tarako] incoming call with lock screen overlapped for a while
Merge pull request #17230 from snowmantw/issue982530-workaround

Bug 982530 - [tarako] incoming call with lock screen overlapped for a while