Merge "Take the /bin/wifi lock in Waveguide scans." into wifitv