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

Change-Id: I58ead8d29296bfa8c9f8bf2197fb47927f02ff51