Merge "Revert "Add a notification that tells users their NFC is blocked"" into rvc-dev