Bug 1039239 - Better NFC handover error handling - v2.0
Merge pull request #22028 from tauzen/Bug_1039239_2.0_with_test

Bug 1039239 - Better NFC handover error handling - v2.0