Merge "Check if item is selectable before calling on click" into nyc-dev