Bug 1072805 - The [Cancel] button was misaligned in the IME menu.
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 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
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.
Merge pull request #24649 from alivedise/bugzilla/1055299_master/v6

Bug 1055299: Ignore continuous app launch request in homescreen side and...r=kgrandon
Bug 1074033 - Edge gestures overlapping
Bug 1075105 - Not showing ambient indicator in LockScreen
Merge pull request #24655 from albertopq/1072728-stk-soft-button

Bug 1072728 -  Truncated STK with soft-button r=frsela
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
Bug 1049723 - Add log reference to Treeherder report. r=mdas
Bug 1071057 - Load sim variant top site customisations. r=kgrandon
Bug 1074903 - Fall back to url if title doesnt exist. r=kgrandon
Bug 1039501 - [User Story] [FOTA] WiFi prioritized for downloading. r=etienne