Merge "Actually use the passed-in executor for unused count" into tm-dev