Merge "Parse extras bundles from NFC tags" into tm-dev