Merge "Prefer non-hidden children in find methods" into nyc-dev