Merge "Fix picking bug: 31701478" into nyc-andromeda-dev