Merge "Fix Activity ref-leak in NFC dispatch API."