Merge "Simplify paint filtering" into sc-dev