Merge "RCFilters UI: Adjust popup positioning again"