Bug 1084160 - [NFC] NDEF_FORMATABLE, NDEF_WRITABLE removal from NfcManager, r=gweng
Merge pull request #25337 from tauzen/Bug1084160_ndef_formatable_removal

Bug 1084160 - [NFC] NDEF_FORMATABLE, NDEF_WRITABLE removal from NfcManager, r=gweng
Bug 1042319 - [Gallery] Update gallery edit UI r=djf