Merge "Delete ShadeViewController.isExpandingOrCollapsing" into main