Merge "Retaining focus on duplicate suggestion when double tapping" into nyc-dev