Merge "Revert "Reroute contactless payment fragments to nfc settings when"" into main