Merge "OOBR in nfc_ncif_proc_ee_discover_req()" into qt-dev