Merge "Enable 6Ghz PSC for normal app scan requests" into sc-dev