Merge changes Id763decf,I3896a2e9 into main

* changes:
  Rename queryCount -> queryIndex
  Rename getDelayUntilNextTaskWithoutBackoff