Merge "Convert GroupedTaskView to Kotlin" into main