Merge "Fix java crash by inconsistent single-line view and view model" into main