Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev