Bug 949016 - [music] include the missing css file in open.html
Bug 951563 - CSS fix for the 5th row of app label on WVGA resolution.
Bug-951287 Multiline quoted encoding elemnets in vcard files
Bug 951095 - [Clock] Increase font-size of counting value in Stopwatch; r=reviews
Bug 951072 - [Clock] Text alignment issue in alarm list; r=reviews
Bug 957100 - [Settings] add marionette for b2g-improve and feedback page
Bug 956169 - Unit tests for shiftkey.js and doublespace.js
Bug 950821 - Add comment clarifying 'undefined' check
Bug 958681 - [B2G][Gaia][Gallery] When a corrupt image is placed on the device the gallery app can appear to continue loading indefinitely with no warning.
[Bug 951972] [music] cannot change progress bar after long tapping on "Random Play" icon
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 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 957990 - Reduce length of subject and body for test_send_xxx_email tests
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 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