Merge "Delete ShadeStateEvents" into main