Merge "NFC: Fix bug with NFC APDU service rebinding"