Merge "Update SilkFX to track targetSdk change" into main