Merge "Deprecate ShadeExpansionStateManager" into main