Merge "Fix SearchView collapse on text input."