Merge "Remove expand and expandToQs from ShadeViewController" into main