Merge "Crash fixes for Gesture selection in Picker mode." into nyc-andromeda-dev