Merge "Begin deleting ShadeExpansionStateManager.addFullExpansionListener" into main