Bug 840147 & Bug 877903 : fix orientation problem on open/close app animation.
                          * Open app by real device orientation
                          * Refactor setAppSize and rotateTransition to AppWindow
Bug 887683: Cancel pick activity correctly while go to background.
Merge pull request #9995 from cvan/marketplace-with-offline

update Marketplace packaged app with offline handler (bug 875849)(cherry picked from commit 1324eea22d3d850cd296c7330571315ab502331d)
Merge pull request #10645 from cvan/marketplace-update

update Marketplace app to get new store ID (bug 887034)
r=julien(cherry picked from commit 084d7a34f1678b5e25233267607bb00db549b39a)
Bug 887651 - [SMS] Contact name is double escaped in Notification - r=gnarf

Removed html escaping when submitting an sms notification. The title is rendered with textContent, so there is no need to escape.

Closes gh-10682
(cherry picked from commit 1f930aa69241162095fc59cb63faad56ccf0c004)
Merge pull request #10387 from rexboy7/fix-bug840147-bug877903-v1train

Bug 840147 & Bug 877903 : fix orientation problem on open/close app animation.
Merge pull request #10660 from alivedise/bugzilla/887683/camera-cancel-pick-in-background

Bug 887683: Cancel pick activity correctly while go to background.
Revert "Merge pull request #10387 from rexboy7/fix-bug840147-bug877903-v1train"

This reverts commit d55d2d2d2317b09cc61404ec6d23c0346e9e006b, reversing
changes made to 9c9f1445afadcfd7078311341d35800f696fc90d.
Bug 881584 - Stop video activity when visibility is changed.
Merge pull request #10684 from alivedise/bugzilla/881584_v1-train_v2

Bug 881584 - Stop video activity when visibility is changed. r=djf, a=leo+
Bug 885584 - [B2G][SMS/MMS] Thumbnails are invisible in the preview attachment with large files - r=julienw

* Sets max thumbnail generation size to 1.5 megs, which should be big enough for any mms image
* Removes a var self = this;
(cherry picked from commit b17b09bf8526be355e2e56a31942c6d9b9d3adab)
Bug 840147 & Bug 877903 : fix orientation problem on open/close app animation.
                          * Open app by real device orientation
                          * Refactor setAppSize and rotateTransition to AppWindow
Bug 883510 - Partner customization should be able to set Facebook OAuth ...
(cherry picked from commit e7479d38f3093a4b9b56d4204057c5711d7f7935)
Bug 888137 - Merge pull request #9895 from RudyLu/keyboard/Bug860318-layout_improvement_commit2
             Bug 860318 - Update keyboard visuals to improve performance. r=timdream
             (cherry picked from commit e6579f1a2a7d980ae93bfa4ffdcbdf47eac8ae97)

Conflicts:
	apps/keyboard/js/render.js
	apps/keyboard/style/keyboard.css
Merge pull request #10572 from RudyLu/keyboard/Bug796600-scrollable_keyboard_layout_menu_commit

Bug 796600 - make the keyboard layout menu scrollable. r=djf(cherry picked from commit 94b7c5ac0cef9439eeee8ca1421c52ccc10421a8)

Conflicts:

	apps/keyboard/js/render.js
Merge pull request #8760 from gasolin/issue-830057

Bug 830057 - [bluetooth][gallery] Icon missing for Bluetooth Transfer in..., r=Ian
(cherry picked from commit 412c325cd87692e38739642b7a204007c4ff151b)
Bug 883058 - [SMS/MMS] One contact with very long name can be scrolled in recipient field r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=883058

- Removes rule about a single contact prohibiting pull down
- Height of recipient-list itself is informative enough to determine "pullable" status
- http://en.wikipedia.org/wiki/Taumatawhakatangihangakoauauotamateapokaiwhenuakitanatahu

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit ef031421fe8d4257fe198112b52d4d963a828498)
Merge pull request #10492 from flodolo/bug883763

Bug 883763 - Fix localizability of "Cell broadcast service", r=kaze
(cherry picked from commit 2990b77b17d88ffcf22ed99bec2f8798211a7a71)
Merge pull request #10666 from steveck-chung/bug-887216

Bug 887216 - [MMS] The header in a group message is active, it works as the go back key
(cherry picked from commit 66bc6cbd4954b423c36cb88c63cf9603d1643e26)
Merge pull request #10676 from mcirlanaru/bug_880617

Bug 880617 - Properly set and display the MAC address. r=@fabi1cazenave
(cherry picked from commit 9e70675f17e450920090ccc8e58c076d3760771e)