Merge "Use command instead of which to locate/run adb" into main