Remove rescores when not sorting by relevance

Bug: 60547
Change-Id: I60c5c8e21b6303d9cf43f6932d85c35d0ef4f9bc
Merge "Remove rescores when not sorting by relevance"