Bug 832274 - Restoring default visibility attributes when updating the UI to undo the effects of the FTE
Merge pull request #7766 from hsinyi/bugzilla/818623

Bug 818623 -  [Dialer] if an outside call hangs up and calls again, the second call does not ring nor give the incoming overlay
Bug 828843 - Remove feedback app from release builds. r=ochameau
(cherry picked from commit 482f18f13924be94a9059e8533a9d2fff423fb76)
bug 833945 - provide packaged and hosted app stubs to dogfooders; r=fabrice
(cherry picked from commit 51b68335c5756e4bd68ff97c23e871ad96218fce)

Conflicts:
	build/utils.js
Merge pull request #7794 from mykmelez/v1-train-stub-apps

bug 833945 - provide packaged and hosted app stubs to dogfooders; r=fabrice
Merge pull request #7774 from albertopq/issue-832936

Bug 825128 - Removing 'loading contacts' overlay r=arcturus
Merge pull request #7756 from albertopq/issue-833816

Bug 833816 - Fixing scrolling on Facebook contacts r=arcturus
Merge pull request #7767 from alivedise/bugzilla/821627-v2/gallery-content-channel

Bug 821627 - Add content channel to shared video player, r=timdream
Merge pull request #7694 from ossreleasefeed/813016-cost-control-reset-should-default-to-month

setting default for reset report to Monthly fixes bug
tracking-b2g18+ and a+
Merge pull request #7770 from lodr/bug-826916-lost-focus

Bug 826916 - Prevent input lost of focus when switching the Unit
Because tracking-b2g18+ and a+
bug 833945 - provide packaged and hosted app stubs to dogfooders; r=fabrice
(cherry picked from commit 51b68335c5756e4bd68ff97c23e871ad96218fce)

Conflicts:
	build/utils.js
Merge pull request #7789 from michalbe/packaged-apps-update

Bug 834047 - update is resumed on startup if already downloaded
Merge pull request #7785 from michalbe/privacy-url

Bug 834036 FirefoxOS Privacy links changed
Bug 826200 - [Settings] The sub menu string of Call forwarding are overlapped with switch icon. r=pike a=vingtetun
Merge pull request #7733 from jmcanterafonseca/phone_prefix_fb

Bug 833356 - [Facebook] When an outgoing / incoming call to a FB Contact...
Merge pull request #7769 from frsela/STK/Bug833638

Bug 833638 - STK Display text does not issue "No response from user" when userClear flag is true, r=vingtetun
Merge pull request #7729 from frsela/STK/Bug832099

Bug 832099 - STK Long Idle mode text gets truncated
Merge pull request #7782 from fcampo/keyboardChange

[828341] Change keyboard layout when changing language
Merge pull request #7737 from ferjm/bug832948

Bug 832948 - [TrustedUI] Use DOMRequest ID instead of mozChromeEvent ID ...
Bug 832376 - The default icon doesn't appear when manifest has an invalid icon URL - stays in "downloading" mode r=daleharvey a=tef+

- fix homescreen tests, had to change the TextOverflowDetective for that
- Don't use the stored old rendered icon if it's not a proper blob.