Merge "Add onEffectDisable effect input" into main