Merge "wil6210: do not start regular scan on stopped p2p device" into msm-4.9