Merge "RCFilters: Prevent trigger element movement"