Bug968061 - [NFC][Gallery][Video] - Prevent the NFC pairing for info view and confirm delete dialog r=johnhu
Bug 1005330 - JSHint fixes for shared/js/download/ r=aus
Bug 1003736 - [Settings] Two column not right displayed
Bug 1004218 - [NFC] Smart Poster Action handling should be removed from NfcManager
encodeHandoverSelect() validates CPS, supports bluetooth name in EIR data and have unit tests.
Bug 1000981 - [NFC] NfcManager handleNdefMessage tests, NfcUtils tests moved to separate file
Bug 1005951 - Follow-up bug 1001370 webapp-shared.js in line 167 is broken
Bug 1005954 - Images are not loaded in merge list
Bug 1005648 - Apps launched by system message don't have screenshots when swiping from the edge.
Bug 1005939 - Border radius is displayed before images are loaded in merge list
Bug 970148 - Support for simple pairing record. r=alive
Merge pull request #18900 from tauzen/Bug1000981

Bug 1000981 - [NFC] NfcManager handleNdefMessage tests, NfcUtils tests moved to separate file, r=alive
Merge pull request #18911 from KevinGrandon/bug_1005330_shared_downloads_jshint

Bug 1005330 - JSHint fixes for shared/js/download/ r=aus
Bug 1003228 - Remove some graphics options from the developer menu as they are not needed any more. r=janx
Bug 1003228 - Remove the toggle button for APZ from the sleep menu. r=janx
Bug 1003228 - Remove redundant force-enabling of APZ in developer builds. r=janx
deleted closing style which was left behind
Merge pull request #18507 from svic/Bug_970148

Bug 970148 - Support for simple pairing record
Merge pull request #18956 from ckerschb/closingStyle

Bug 858787 - Followup to: Flip the pref to turn on the CSP 1.0 parser for Firefox OS. r=gwagner
Merge pull request #18864 from punamdahiya/Bug968061

Bug968061 - [NFC][Gallery][Video] - Prevent the NFC pairing for info view and confirm delete dialog r=johnhu