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 1075750 - Remove reference to a dead pref. r=fabrice
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 1072728 -  Truncated STK with soft-button r=frsela
Bug 1071445 - [Settings]Cap letter for titles on panels based on new Building Blocks
Merge pull request #24649 from alivedise/bugzilla/1055299_master/v6

Bug 1055299: Ignore continuous app launch request in homescreen side and...r=kgrandon
Bug 1068978 - [CBS] Migrate all ril.cellbroadcast.disabled setting to multi client format
Bug 1074033 - Edge gestures overlapping
Bug 1070688 - [settings] unit test refactoring for new version chai.assert api
Bug 1075105 - Not showing ambient indicator in LockScreen
BUG 1063515 - [Clock] Alarm Test Date handling getNextAlarmFireTime
Merge pull request #24655 from albertopq/1072728-stk-soft-button

Bug 1072728 -  Truncated STK with soft-button r=frsela
Bug 848400 - [E-Mail] Support attaching any file available on the SD card(s)
Bug 1074028 - Overlapping rocketbar and statusbar icons for 3rd party apps
Merge pull request #24671 from albertopq/1075105-remove-ambient-lockscreen

Bug 1075105 - Not showing ambient indicator in LockScreen r=mhenretty
Merge pull request #24668 from albertopq/1074033-overlap-statusbar-2

Bug 1074033 - Edge gestures overlapping r=alive