Merge "RCFilters: Fix highlight circle misalignment"