Merge "Revert "Add expansion fraction to ShadeInteractor"" into main