Merge "Fix channel set option in wifi batch scan command." into klp-dev