Merge "Prevent double tap on suggestions" into nyc-mr1-dev