Merge changes Iaa535e94,I294a3b7d into main

* changes:
  Hydrator is traceable.
  Removes SysUiViewModel