Bug 959543 - [CostControl] Remove reference to lastSIM property
Bug 959175 - Force redraw on uppercase switch when layout has secondLayout flag
Bug 957122 - Enable more TBPL tests - Settings app

Enable test_settings_app_permissions on TBPL
Bug 957122 - Enable more TBPL tests - Lockscreen

Enable test_lockscreen_wake_with_notification on TBPL

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini
Bug 960170 - [Calendar][Integration Test] use chai.assert instead of regular assert for better error messages
Bug 946205 - Re-enable Travis tests after 891882 merged
Bug 960290 - email: possible to trigger off-screen compose button
Bug 849223 - Adding default values for the gaia.ui.* theming settings
r=vingtetun
Bug 960081 - Make use of shared mock Notification in Dialer call log tests
bug 948826, add prompt testing

clone uitests into uitests-privileged and set it as a privileged app

test
 - contacts
 - geolocation
 - device-storage
 - userMedia

remove unnecessary part in uitests-privielged
skip on desktop because there's no microphone available
Bug 960039 - [system] Remove `charging` attribute

Remove unused, non-standard `charging` attribute from the markup for the
battery icon.
Bug 945150 - [DSDS] SIM manager(when PIN locked or no SIM), Call Settings, Message Settings and Cellular & Data are still accessible when airplane mode is on.
Merge pull request #15403 from etiennesegonzac/bug-849223-css-system-settings

Bug 849223 - Adding default values for the gaia.ui.* theming settings
Revert "Bug 957100 - [Settings] add marionette for b2g-improve and feedback page"

This reverts commit 0b49a29ae694f55333ab2a0054d85597a3e5582d.
Merge pull request #15415 from KevinGrandon/revert_pr_15065

Revert "Bug 957100 - [Settings] add marionette for b2g-improve and feedback page"
Merge pull request #15117 from jaoo/945150

Bug 945150 - [DSDS] SIM manager(when PIN locked or no SIM), Call Settings, Message Settings and Cellular & Data are still accessible when airplane mode is on. r=arthurcc
Bug 938540 - Use Notification API for WapPush
Bug 878603 - [Messages] Always show the counter for available characters from 20 instead of 10 r=julien
Bug 931711 - mozContact constructor creates unconsistent objects with the 'undefined' string as 'id'
Bug 943812 - Remove "R$" from English keyboard layout.