Merge pull request #9151 from etiennesegonzac/bug-859354-call-waiting-alert

Bug 859354 - Add and alerting tone when a second call is waiting.(cherry picked from commit 0cda546da5a2d455f95cf02a189f5f56ab0a5be5)

Conflicts:
	apps/communications/dialer/js/keypad.js
Merge pull request #9304 from mozsquib/email-account-setup-wrap

Bug 863610 - [email] Accounts in the Account Setup can take two lines(cherry picked from commit e0fec96c6e934d39c2da3fec41af01de72f0ac07)
Merge pull request #8564 from alivedise/bugzilla/820177/voice-volume-has-no-mute-state

Bug 820177 - Voice channel doesn't need mute state, r=timdream, a=blocking-b2g:tef+
Merge pull request #9197 from alivedise/bugzilla/856946_master

Bug 856946 - Release CPU wakelock when active channel is telephony, r=timdream, a=blocking-b2g:tef+
Merge pull request #9155 from albertopq/bug-861249

Bug 861249 - Fixing Contacts unit tests r=rik
Conflicts:
	apps/communications/contacts/js/contacts.js
Merge pull request #8934 from ian-liu/ril/Bug845629_change_mnc_mcc_type_from_integer_to_string

Bug 845629 - [Gaia] change mcc/mnc type from integer to string. r=kaze(cherry picked from commit 96a236d8a4c47447a4a16be60c1b457d7254acf9)
Merge pull request #9282 from jaoo/863125

Bug 863125 - (REGIONAL) Voice mail number is not configured. r=kaze(cherry picked from commit 40bf6cec698a738493f64bf974663af02c97b094)
Merge pull request #9292 from mcirlanaru/bug_863282

Bug 863282 - [LockScreen] Open regular camera app if passcode timeout is active, r=@timdream(cherry picked from commit 9b68d1267999968a15b593bf4b0b833c4a839500)
Merge pull request #9245 from jaoo/860411

Bug 860411 - Roaming Broker or Double IMSI SIM card, r=kaze(cherry picked from commit 08f2547c34b02fb7920efc4e31e22023ce638873)
Merge pull request #9317 from asutherland/email-tcp-fix

Bug 863664 - [email] Use ArrayBuffer instead of Uint8Array. rs=squib(cherry picked from commit 00fdfe06eecd1ac37a3abcf39cea2bb05cba359a)
Merge pull request #8919 from PeterLa/836299pla

Bug 836299 - Revise Various Action Icons r=samjoch(cherry picked from commit 2d33f6edeb39680cca57fc7c763e053efa3d06f3)

Conflicts:
	shared/style/headers/images/icons/send@2x.png
Merge pull request #9213 from samjoch/follow-up-bug-823414

Bug 823414 - B2G browser gradient value does not match the gradient found in Settings (followup) r=me(cherry picked from commit 208848fd6dd04c090df3b89c0a1a51282c4731f7)

Conflicts:
	apps/browser/style/images/tabs-badge-background@2x.png
	apps/browser/style/images/tabs-list-background@2x.png
Bug 844726 - Save screenshot on exit

Conflicts:
	apps/system/js/cards_view.js
Bug 861142 - Take a screenshot if we don't have one in the cache.

Conflicts:
	apps/system/js/cards_view.js
Merge pull request #8891 from KevinGrandon/bug_856189_calendar_sync_icon

Bug 856189 - Add missing icon(cherry picked from commit 3d7523e73a555b58efdd0b35e63264244b27b857)
Merge pull request #9335 from albertopq/contacts-fix-imgLoader-search

Bug 864095 - TypeError: loadImage is not a function r=crdlc (cherry picked from commit 59edecbac6f61d470e3ea0573f6b9e06ceb8c5ed)
Bug 860634 - Add L10n id to elements
Merge pull request #7955 from ian-liu/clock/Bug828960_remove_never_label_from_alarmlist

Bug 828960 - [Clock] When alarm is set to never repeat, the Never label under alarm time is confusing. r=timdream(cherry picked from commit 38ccb22bd0a9db2091931cd341795ff587e3d723)
Merge pull request #9313 from ian-liu/clock/Bug832246_refine_layout_of_onring_label

Bug 832246 - [clock] Alarm label doesnt display completely when alarm rings r=timdream(cherry picked from commit 0874b5e84129391de9edb23560be8ad52b3d2bed)
Bug 863196 - Workaround on FTU and active audio channel to avoid the
power-on clip is too short.