Merge "Remove usage of deprecated SkImage::makeWithFilter API call" into main