Merge "Revert "Add View.viewModel utility"" into main