Merge "Revert^2 "Change ifname to interface handle in set_scan_mode api"" into main