Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev