Merge "Prevent OOB access in Ndef read" into qt-qpr1-dev