Bug 1045701 - Part 1 [Collection App] - Use proper icon regardless of device size r=yurenju
Bug 1046554 - Follow-up, fix linter issues r=me
Revert "Bug 1046554 - Follow-up, fix linter issues r=me"

This reverts commit 25701a4f9fc4bd1d1dc4a1d4bedfe66ee8c94502.
Revert "Bug1046554 - B2G NFC: pass NFCPeerEvent in onpeerready"
Merge pull request #22579 from mozilla-b2g/revert-22394-Bug1046554

Revert "Bug1046554 - B2G NFC: pass NFCPeerEvent in onpeerready"
Merge pull request #22436 from KevinGrandon/bug_1045701_smart_collection_icon_build_master

Bug 1045701 - Part 1 [Collection App] - Use proper icon regardless of device size