Merge changes I09ee6f35,I0c1f69fe into main

* changes:
  Use the display specific DarkIconDispatcher in most places
  Start using DarkIconDispatcherStore and LightBarControllerStore