Merge "Use getJump{Pass,Drop}Label for counter range checks" into main