Merge "Remove stale weak reference to Filter" into sc-dev