Merge changes I060272e6,I50679b66 into main

* changes:
  Move barState to PanelExpansionInteractor
  Move isTracking to PanelExpansionInteractor