Bug 951563 - CSS fix for the 5th row of app label on WVGA resolution.
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 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 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 958423 - ndef in 'nfc-manager-tech-discovered' is two levels of array.
Bug 955887 -  [Buri] "Add Collection" wallpaper label missing

the root cause is we didn't use foo.en-US.properties for en-US instead
of en-US/apps/foo/foo.properties if GAIA_CONCAT_LOCALES=1, so we need to
use the original file in gaia directory not in locale basedir.
Bug 960290 - email: possible to trigger off-screen compose button
Merge pull request #15138 from RudyLu/homescreen/Bug951563_css_tweak_wvga

Bug 951563 - CSS fix for the 5th row of app label on WVGA resolution.
r=crdlc.
Bug 951888 - Add a check on the existence of mozMobileConnections
Merge pull request #15392 from crh0716/951888

Bug 951888 - Add a check on the existence of mozMobileConnections r=alive
Merge pull request #15393 from yurenju/bug955887

Bug 955887 -  [Buri] "Add Collection" wallpaper label missing r=@timdream
Bug 855165 - Migrate Messages to new Notification API and close notifications upon reading of threads
Bug 959283 - [B2G][Bluetooth File Transfer] On bluetooth transfer of multiple images opening concurrent recieved pictures through notification bar results in a blank gallery screen