Merge "Differentiate empty-string + filter searching from just tapping a filter" into rvc-dev