Merge "Adding viewmodel and composable for tile layout refactor" into main