Merge "Include 6GHz band in scanning" into rvc-dev