Bug 951563 - CSS fix for the 5th row of app label on WVGA resolution.
Bug 957100 - [Settings] add marionette for b2g-improve and feedback page
Bug 958555 - Accesing the Camera app from the Message app using marionette, causes the Camera app to become unresponsive
Bug 959543 - [CostControl] Remove reference to lastSIM property
Bug 959175 - Force redraw on uppercase switch when layout has secondLayout flag
Bug 947504 - Only enable HwcComposer2D by default if hardware support it
Bug 958146 - [Camera] fxos specific APIs need to be mocked in order to renable some of the unit tests
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 952164 - [B2G][Camera] Camera on lock screen allows user to take picture after clicking thumbnail preview despite no camera button being present
Bug 959043 - Fix Software Home Button on Nexus4
Bug 956428 - Add checks on set/getPreferredNetworkType
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 959447 - Remove twittershare test app
Bug 960094 - Multiple CSS warnings shown when launching E-Mail app
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
Merge pull request #15373 from wilsonpage/bug/958146

Bug 958146 - [Camera] fxos specific APIs need to be mocked in order to r...
Merge pull request #15220 from dmarcos/bug958555

Bug 958555 - Accesing the Camera app from the Message app using marionet...
Merge pull request #14995 from wilsonpage/bug/952164

Bug 952164 - [B2G][Camera] Camera on lock screen allows user to take pic...