Merge "nfc(api): Address API council feedback for setReaderMode" into main