Merge "Add adapter to support new ViewModel" into main