Merge pull request #7798 from frsela/STK/Bug829827

Bug 829827 - STK Setup call confirmation does not display properly, r=vingtetun
Bug 833981 - [Email] Black screen when sending email to contact before setup. r=schung, a=approval-gaia-v1 by lsblakk

cherry-picked 474c86518e354da36207b4c4f02d4a10c981e614 from gaia/master
which was landed in merge e59ad4d177675eb1f25fb7406a439d77195441db
Merge pull request #7870 from asutherland/email-cancel-create-v1-train

Bug 833981 - [Email] Black screen when sending email to contact before setup. r=schung, a=approval-gaia-v1 by lsblakk
Bug 835149 - [email/IMAP] folder list sync breaks if IMAP server (ex: courier) returns folders in non-hierarchy order. r=squib, a=approval-gaia-v1 by sicking.

cherry-picked c721f35db7e372f316a162f1ec00c2d13ea8a1fb from gaia/master
which was landed in merge 622ae151f123ff2ca12d0335c40bb8e7a8442737

https://bugzilla.mozilla.org/show_bug.cgi?id=835149#c5
Merge pull request #7742 from escapewindow/master

bug 827778 - Remove shared/resources/languages-*.json
Merge pull request #7871 from asutherland/email-hierarchy-fix-v1-train

Bug 835149 - [email/IMAP] folder list sync breaks if IMAP server (ex: courier) returns folders in non-hierarchy order. r=squib, a=approval-gaia-v1 by sicking.
Bug 834926 - only create one thumbnail per album r=jlal
Merge pull request #7811 from zbraniecki/bug799747

Bug 808216: reorder CSS to avoid initial transition and whitescreen flash in Settings
Merge pull request #7823 from frsela/STK/Bug833630_UI

Bug 833630 - STK Display text does not give option to terminate SIM session, r=vingtetun
Merge pull request #7838 from frsela/STK/Bug833630_b

Bug 833630 - STK Display text does not give option to terminate SIM session, r=vingtetun
Merge pull request #7741 from KevinGrandon/bug_833552_email_keyboard_focus

Bug 833552 - Call stopPropagation when we want to add a contact
Merge pull request #7624 from KevinGrandon/bug_828970_week_view_empty

Bug 817745 - Sticky all-day events
Merge pull request #7687 from michalbe/update-notification

Bug 830288 - update notification count when the download/update is trige...
Merge pull request #7812 from alivedise/bugzilla/824703/nonfullscreen-fullscreen-prompt

Bug 824703 - nonfullscreen fullscreen permission prompt, r=timdream
Merge pull request #7748 from lodr/bug-829511-explanations

Bug 829511 - Adding hints to Cost Control FTE
Cause a+ and b2g18+
Merge pull request #7850 from lodr/bug-833784-balance-notifications

Bug 833784 - Adding desktop notifications when surpassing the limit for balance and reaching zero credit
Causa a+ and b2g18+
Merge pull request #7389 from crh0716/827228

Bug 827228 - Show appropriate text based on the mode of editing or creating events
Bug 833454 - Window manager app switch transition race condition
Merge pull request #7874 from alivedise/bugzilla/833454_v1-train/cards-view-stuck

Bug 833454 - Window manager app switch transition race condition, r=timdream, a=blocking-b2g:tef+
Bug 834426 - inline activity frame list when attention screen arrives