Merge changes I15b67961,I98ad3af3 into main

* changes:
  [flexiglass] CentralSurfaces is a dep of StatusBarStateController.
  Changes CoreStartable Dependencies to use Class.