Merge "Prevent OOB read in nfa_dm_handle_message" into qt-qpr1-dev