Merge "Improve NDEF push API"