Merge "RCFilters: Correct display of save filter popup"