Merge "RCLFilters: UI tweaks"