Bug 1074083 - [NFC][KK] Background of shrinking UI would show app icons if website has ever been run at the background
Bug 1073646 - [Settings] Clear bookmarks data does not work properly
Bug 1061411 - [Contacts] ICE 1 & ICE 2 can be set to the same contact
Bug 1072819 - Lock screen fade out animation "stutters"
Bug 1069132 - [Lockscreen] Newer notifications are not actionable when music player widget is on with 320x480 devices
Bug 1068978 - [CBS] Migrate all ril.cellbroadcast.disabled setting to multi client format
Bug 1064903 - Update to latest gaia-icons
Merge pull request #24831 from wilsonpage/1064903-v2.1

Bug 1064903 - Update to latest gaia-icons
Merge pull request #24757 from jmcanterafonseca/fix_patch_same_ice_21

Bug 1061411 - [Contacts] ICE 1 & ICE 2 can be set to the same contact
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

Conflicts:
	shared/elements/gaia_grid/js/grid_view.js
Bug 1072728 -  Truncated STK with soft-button r=frsela
Bug 1075105 - Not showing ambient indicator in LockScreen
Bug 1071057 - Load sim variant top site customisations. r=kgrandon
Bug 1011016 - marketplace dev
Merge pull request #24730 from snowmantw/issue1069132-2.1

Bug 1069132 - [Lockscreen] Newer notifications are not actionable when m...
Bug 1074103 - Get supported network types every time when navigating to operator settings panel
Merge pull request #24862 from crh0716/1074103_v2.1

Bug 1074103 - Get supported network types every time when navigating to operator settings panel
Merge pull request #24746 from crdlc/bug-1073646-v2.1

Bug 1073646 - [Settings] Clear bookmarks data does not work properly
Merge pull request #24363 from EragonJ/v2.1-bug-1068978

Bug 1068978 - [CBS] Migrate all ril.cellbroadcast.disabled setting to mu...
Bug 1071235 - Fix touching fullscreen video displaying controls r=alive

CSS background-color in ".appWindow.collapsible .screenshot-overlay"
makes the platform breaking tapping on a fullscreen video. Setting
'visiblity: hidden' when we are fullscreen does workaround the issue.