Merge "RCFilters: Treat saved query with multiple spaces as empty"