Bug 1013764 - [System] Include the screen dimming time also in Screen time out.
Bug 1000130 - Clean up bootstrap mozL10n API use in Gallery. r=djf
Bug 948447 - Convert Facebook to new Notification API
Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales
Bug 1020903 - Missing splash icon when an application is hosted via https

With the way the URI was constructed before, if https was used with
default port, a.port would be empty and port 80 would wrongly be used.
Instead, we now use the origin as it is.
Bug 1020403 - Change button type to button to prevent click event on submit
Bug 1007591 - [SMS] Make SMS react upon the IAC broadcast from Cost Control application to friendly mute Cost Control specific SMS
Merge pull request #19757 from sharaf-tir/Bug_1013764_Include_the_screen_dimming_time_also_in_Screen_time_out

Bug 1013764 - [System] Include the screen dimming time also in Screen ti...
Merge pull request #20027 from fcampo/fb-notif-api-948447

Bug 948447 - Convert Facebook to new Notification API (r=jmcf)
Merge pull request #20066 from lanker-sony/splash-icon-uri

Bug 1020903 - Missing splash icon when an application is hosted via https
Merge pull request #20074 from benfrancis/1020403

Bug 1020403 - Change button type to button to prevent click event on submit r=daleharvey
Bug 1020002: don't allow an activity choice that could subvert forward-lock

address review comments
Merge pull request #18584 from stasm/1000130-gallery-ready

Bug 1000130 - Clean up bootstrap mozL10n API use in Gallery. r=djf
Merge pull request #20029 from davidflanagan/bug1020002

Bug 1020002: don't allow an activity choice that could subvert forward-lock
Revert "Merge pull request #20033 from eeejay/bug-1020605"

This reverts commit 763b7f62805570b1606b8738075318020af3fa7d, reversing
changes made to e794eeb8dcb308cd7b1580717ef38e2880987634.
Merge pull request #19943 from millermedeiros/1019617-week-view-am-pm

Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales r=gaye
Revert "Merge pull request #19770 from tauzen/Bug1017572"

This reverts commit e794eeb8dcb308cd7b1580717ef38e2880987634, reversing
changes made to f6b5f77d47d103c672be388082f04709ccdf7f08.
Bug 1003191 - Use mozL10n.once in the fl app. r=djf
Merge pull request #18790 from stasm/1003191-fl-ready

Bug 1003191 - Use mozL10n.once in the fl app. r=djf
Revert "Merge pull request #19912 from kamituel/Bug_1019169_byte_str_conv"

This reverts commit 0f5dc07363da7a3f27e3ad5f1f7f957265e79bd8, reversing
changes made to 763b7f62805570b1606b8738075318020af3fa7d.