Bug 828965 - Move permission screen z-index on lockscreen camera
Merge pull request #10429 from alivedise/bugzilla/828965_v1-train/permission-screen-on-lockscreen

Bug 828965 - Move permission screen z-index on lockscreen camera, r=timdream, a=leo+
Merge pull request #10328 from pivanov/bug-880240

Bug 880240 - Update Firefox Logo on device r=@samjoch(cherry picked from commit 6a17febce2551cd3a764bb3bce39fe9ca88c5ca4)

Conflicts:
	shared/resources/branding/official/Browser@2x.png
	shared/resources/branding/official/about_logo@2x.png
	shared/resources/branding/official/initlogo@2x.png
	shared/resources/branding/official/logosmall@2x.png
	shared/resources/branding/official/powered@2x.png
	shared/resources/branding/official/privacy_sprite@2x.png
Merge pull request #10076 from jaoo/876543

Bug 876543 - [Settings] Configure voicemail info through the Settings App. r=kaze,etienne a=leo+(cherry picked from commit 4addf3f4fe3852abc71da7766efe741601250d9f)
Merge pull request #10338 from jaoo/882057

Bug 882057 - Voicemail user setting is lost after killing then restarting the Settings app, r=kaze(cherry picked from commit 710f193389c3b8e03cb7fd0ef4a07964c406ea56)
Merge pull request #10441 from gtorodelvalle/dialer-bug-883760-delete-button-enabled

Bug 883760 - [Call log] Edit mode is open direclty as if there were entries selected to be deleted (r=fcampo).(cherry picked from commit 95e028eb259010581c97ef72e2c90243379581e8)
Merge pull request #10433 from huchengtw-moz/costcontrol/Bug_883705_usage_graph_wifi_toggle_always_off

Bug 883705 - [Cost Control]In Usage Graph Wi-Fi Toggle is always uncheck...
r=salva(cherry picked from commit 016a92d86d3b9afb264ea350ad93ef8e687cf7b0)
Merge pull request #10399 from arcturus/bug-882067

Bug 882067 - [SMS] Unable to send SMS after opening the link from previous received thread(cherry picked from commit d1b34372322dd53686bc198f15cd1e0a9c602c12)
Merge pull request #10438 from airpingu/bug-880648-mms-accented-characters-part-2

Bug 880648 - [MMS] Accented characters are not correctly sent/received in a MMS (part 2, content blob must be encoded by utf-8). r=steveck-chung, a=leo+(cherry picked from commit 70e1de2de1722e6ecd131d68a0a403f5e1054166)
Merge pull request #10293 from RudyLu/keyboard/Bug852785-hideKeyboard_before_show_activityMenu

Bug 852785 - Hide keyboard before activity menu shows. r=alive(cherry picked from commit bd07ce233160a0e6325bf736769772a9d2273458)

Conflicts:
	apps/system/js/keyboard_manager.js
Merge pull request #10458 from Rik/disable-travis

Bug 884217 - Disable travis on v1.1.0hd r=yurenju(cherry picked from commit 48c005e720aaf810edc5d67ac2aa983dbbca47e1)