Bug 1020723 - Remove NFC duplicated code
Merge pull request #20047 from sergi/browser_cleanup

Bug 1020723 - Remove NFC duplicated code [r=daleharvey]