Merge "Fix QS wifi scan state" into oc-dr1-dev