Bug 880609 - Request wake lock failed after device is off and on.
Bug 878422 - [Homescreen] Logo stays forever after the quick access bar crashed
Merge pull request #10352 from davidflanagan/bug882197

Bug 882197: remember cursor position after calling replaceSurroundingText r=dhylands(cherry picked from commit d86821224617d03f566fa7668e5fe68df764893e)
Merge pull request #10376 from davidflanagan/bug882197-v1-train

Merge pull request #10352 from davidflanagan/bug882197
Merge pull request #10265 from dominickuo/bug-870320

Bug 870320 - [email] adjust attachments on compose page, r=asutherland(cherry picked from commit ceb11c3bd0b3c7a022f87c1adb80610c4d9d4275)
Merge pull request #10383 from alivedise/bugzilla/880609/wake-lock-after-device-off-and-on

Bug 880609 - Request wake lock failed after device is off and on.r=timdream,a=leo+
Bug 882363 - Only enable Facebook functionality if the app id is part of the partner customization.
Merge pull request #10335 from crdlc/bug-878422-v2

Bug 878422 - [Homescreen] Logo stays forever after the quick access bar ...
Bug 832239 - uplift to v1-train, continued
Merge pull request #10393 from fabi1cazenave/uplift-bug832239

Bug 832239 - uplift to v1-train, continued
Bug 881823 - [SMS][MMS] Regression. Contact search results style lost r=borjasalguero

https://bugzilla.mozilla.org/show_bug.cgi?id=881823
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit be3ce36ecdd7e794b844fb70a74963839280a93f)
Merge pull request #10148 from mcirlanaru/bug_878421

Bug 878421 - [FTE] Properly set language keyboard when flashing device, r=@RudyLu(cherry picked from commit ffb2e62fab140ed6846c3cabc4b0ac819639ed3f)
Merge pull request #10377 from mozshiao9/master_camera_881539

Bug 881539 - [camera] buttons in filmstrip preview mode are white-on-white r=djf(cherry picked from commit c2dc260db50edc82237d7a35d8bb65a8a5d02faa)
Merge pull request #10363 from huchengtw-moz/video/Bug_879362_when_youtube_video_complete_ux_is_ambiguous

Bug 879362 - [A/V][video] When YouTube video completes, UX (Pause button...r=@djf(cherry picked from commit 9e582ada7046a0e2278ebbc8a0942537b0908520)
Merge pull request #10310 from crh0716/876335

Bug 876335 - Update additional information by HandledCall itself(cherry picked from commit ea92e6758ad1cfbda60d721017652deead91a788)
Merge pull request #10379 from mozshiao9/master_mms_882129

Bug 882129 - [MMS] [UX] Thread view. Spinner inside bubbles should be centered in the 4 rem margin. r=steveck-chung(cherry picked from commit ab22d8a4adc1b8bb5d764f623b230760cc9c67b3)
Bug 882369 - [SMS][MMS] Regression. contactList => contact-list for search results and group view r=borjasalguero

https://bugzilla.mozilla.org/show_bug.cgi?id=882369
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 3dee169168113a8b166ef2700ad0671d9022abfb)
Merge pull request #10367 from lissyx/bug882607

Bug 882607 - Using white-space: pre-wrap for SMS and MMS
r=julien(cherry picked from commit 141ed6da339f477523dcc932217fc0ba7a0ea68d)
Merge pull request #10045 from daleharvey/853362

Bug 853362 - Move toggle flash / camera icons when filmstrip shown. r=djf(cherry picked from commit 6b75dbb7888acc7d094ae60c0302df7d49e056d7)

Conflicts:
	apps/camera/style/camera.css
Merge pull request #10246 from mozsquib/camera-pick-ux

Bug 870726 - [Camera] Confirmation of successful Image pick for email attachments and wallpaper(cherry picked from commit 3434257da95043dbfa930e1747325b4e34c02162)

Conflicts:
	apps/camera/index.html