Merge "Reader mode NFC API: move to callback model." into klp-dev