Merge changes Ied8ebd0a,Idb840f9d into main

* changes:
  Turn PanelExpansionInteractor into an interface
  Delete methods from ShadeViewController