Bug 963173 - Ensure address bar is always displayed when a different tab is selected
Bug 958675 - [email] Upgrade alameda.js to get latest prim
Merge pull request #15735 from jaoo/964345

Bug 964345 - [DSDS] Wrong panel navigation flow for call settings and cellular and data menu items. r=arthurcc
Bug 961557 - Blur event causing rocketbar focus to be lost r=alive
Bug 959800 - [Offline] mozbrowser iframes don't display correct offline content
Disable failing unit tests
Merge pull request #15278 from jrburke/bug958675-email-upgrade-alameda

Bug 958675 - [email] Upgrade alameda.js to get latest prim r=asuth
Merge pull request #15788 from gregorwagner/disable

Bug 965083 - Disable failing unit tests for a green tbpl. r=jgriffin
Bug 964450 - [E.me]let entry not overlap by menu while keyboard pop
Bug 962452 - Restore the automatic selection settings when navigating to the panel
Merge pull request #15675 from crh0716/959962

Bug 959962 - Set correct width based on the padding r=alive
Merge pull request #15760 from crh0716/943227

Bug 943227 - Stop using emergencyCallsOnly attribute r=alive
Bug 958412 - [Gaia][DSDS] move simcard detection logic to system app

- add sim_settings_helper
- add related test
- update slot.isAbsent()
Merge pull request #15728 from crh0716/962452

Bug 962452 - Restore the automatic selection settings when navigating to the panel r=jaoo
Revert "Bug 962938 - Inconsistent file path in zip file"

This reverts commit 27c9fbbdac521950cb149848a73080d62312c7f4.
Revert "Bug 962976 - Use a blacklist to avoid compressing specific file types which are already compressed r=yurenju"

This reverts commit 6c99ac252d1c75b06b3883e98d8ea36913ea36f1.
Revert "Bug 957497 - Enable alignStoredFiles()"

This reverts commit 21f03c19a6659580b83004ae2757b539b1ee9782.
Revert "Bug 957497 - Allow include of uncompressed data files in the package apps"

This reverts commit 3eb52bf51d1ce57cdbbf9ee8cade488d77985ef1.

Conflicts:
	build/utils-xpc.js
	build/utils.js
Merge pull request #15362 from chirarobert/new_branch

Bug 936505 - Neaten up test_settings_wallpaper
Merge pull request #15707 from EragonJ/bug-958412

Bug 958412 - [Gaia][DSDS] move simcard detection logic to system app