Merge "Enable 6Ghz PSC scanning optimization" into sc-dev