Merge "settings: Remove @hide NFC API usage" into main