Merge "matrix: add nfc 1.1" into pi-dev