bug 1064975 - Manually check evt.detail for evt.detail.filter instead of short-hand assignment. r=kgrandon
Bug 1060727 - [CMAS] Duplicated notifications in system tray when dismiss the attention screen by tapping on home button
Bug 1063740 - Home screen is shown in landscape mode when canceling out of search app. r=kgrandon
Bug 1063305 - NFC icon disappear after reboot
Merge pull request #24117 from nullaus/bug1064975

bug 1064975 - Manually check evt.detail for evt.detail.filter instead of...
Bug 1055299: Ignore continuous app launch request in homescreen side and send homescreen to background while rocketbar is open in system side
Bug 1066045 - [v2.2][v2.1] Rapidly tapping record after switching from picture to camera mode will take photo instead of video

Conflicts:
	apps/camera/js/views/controls.js
Bug 1063310 - [email] When sending multiple attachments, all but the first are sent as zero-byte attachments. r=asuth
Bug 1065167 - [email] The contents of the outbox won't show until any active sending process completes due to held mutex by sending process. r=asuth
Bug 1065421 - Add theme color to clock
Bug 1052256 - Block the click events before the first panel gets ready
Bug 1062720 - [STK] Should carry the response in |isYesNo| for "Yes"/"No" request. r=frsela
Bug 1061636 - Remove icons from the Cost Control widget FTU section
Bug 1061858 - [Cost Control][Usage app] Usage app disables Wifi tracking after exiting/launching Usage app
Bug 1069270 - [v2.1] Fix test_sms_contact failure
Bug 1066793 - improved ambient notification indicator accessibility. r=alive
Merge pull request #24182 from yzen/bug-1066793

Bug 1066793 - improved ambient notification indicator accessibility. r=a...
Bug 1066847 -  Statusbar icons disappear in utility tray r=mhenretty
Bug 1057965 - [Devices][Storage] SD card section does not show on media storage after detected unknown SD card
Bug 1064315 - [camera] Update gaia-header and gaia-icons