Merge changes Ieef31926,I5501b487 into main

* changes:
  Revert^2 "Add View.viewModel utility"
  Split up FlowDumper implementations.