Merge "Update suggestion UI"