Merge "[DO NOT MERGE]wifi: scan enhancement" into udc-qpr-dev