Bug 957100 - [Settings] add marionette for b2g-improve and feedback page
Bug 959175 - Force redraw on uppercase switch when layout has secondLayout flag
Bug 947504 - Only enable HwcComposer2D by default if hardware support it
Bug 957122 - Enable more TBPL tests - Settings app

Enable test_settings_app_permissions on TBPL
Bug 957122 - Enable more TBPL tests - System app

Enable test_context_menu_activity_picker 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 952482 - [FTE] "SIM 1" is written to enter the PIN for the SIM, even when the phone is single sim
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 869289 - Video app fails to list videos where it can't generate a thumbnail
Bug 958423 - ndef in 'nfc-manager-tech-discovered' is two levels of array.
Bug 960290 - email: possible to trigger off-screen compose button
Bug 957529 - Add more unit tests for fb_data modules (error conditions, particularly datastore)
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
Merge pull request #14837 from cctuan/869289

Bug 869289 - Video app fails to list videos where it can't generate a th...
Bug 953098 - [Fugu][Contact] Search bar is unavailable after deleting contact in the search results
Merge pull request #15151 from jmcanterafonseca/bug_add_more_unit_tests_fb

Bug 957529 - Add more unit tests for fb_data modules (error conditions, ...
Merge pull request #15065 from cctuan/957100

Bug 957100 - [Settings] add marionette for b2g-improve and feedback page
Bug 959285 - [Search] Abort in-progress provider requests r=amirn