Merge changes Ic349e0b0,I061733d7 into main

* changes:
  Fix LOHS stealing pending tethered SoftAP requests
  Pre-emptively fail pending pan requests upon opposite request