Merge "[flexiglass] Unify methods to collapse the shade under ShadeInteractor." into main