Merge "New ViewModel implements Dumpable" into main