Merge "blkpm: avoid sleep when holding queue lock"