Merge "RCFilters: Trim spaces in saved query names"