Merge "qcacmn: populate qos_null in rx state"