Bug 1072913 - Disable test_play_3gp_video until Bug 1050667 is fixed
Bug 1061503 - Comments field in contact edit form needs to have the text at the top, and be converted to a textarea
Bug 1037354 - Remove the obsolete references to the TelephonyCall.number and TelephonyCall.secondNumber fields. r=etienne
Bug 1072805 - The [Cancel] button was misaligned in the IME menu.
Bug 1075750 - Remove reference to a dead pref. r=fabrice
Bug 1026384 - [MMS]Display switching of SMS/MMS composition screen
Bug 1070731 - [sms] unit test refactoring for new version chai.assert api
Bug 1076231 - Fix racy unit tests in GaiaSimPicker. r=Rik
Bug 1061398 - Incall keypad layout needs adjustment
Bug 1055299: Ignore continuous app launch request in homescreen side and send homescreen to background while rocketbar is open in system side

Conflicts:
	shared/elements/gaia_grid/js/grid_view.js
Bug 1074800 - NfcHandler starts to listen for peerready only when NFC is enabled, r=alive
Bug 1072728 -  Truncated STK with soft-button r=frsela
Bug 1076716 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/calendar/test/marionette/day_view_test.js | day view "before each" hook r=kgrandon
Bug 1071445 - [Settings]Cap letter for titles on panels based on new Building Blocks
Merge pull request #24562 from RudyLu/ime/Bug1072805_ime_button_misAligned

Bug 1072805 - The [Cancel] button was misaligned in the IME menu.
r=alive, yzen.
Bug 1070865 - Fix incorrect resize within popup window
Merge pull request #24649 from alivedise/bugzilla/1055299_master/v6

Bug 1055299: Ignore continuous app launch request in homescreen side and...r=kgrandon
Bug 1076216 - Attention indicator polish
Bug 1068978 - [CBS] Migrate all ril.cellbroadcast.disabled setting to multi client format
Bug 1074033 - Edge gestures overlapping