Merge "Revert^2 "Delete ShadeFullExpansionListener"" into main