Merge changes Icbc6fcac,I3651e364 into main

* changes:
  Introduce DarkIconDispatcherStore for multiple displays
  Prepare DarkIconDispatcher for multiple displays