Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev