Merge "Separate the normal and edit versions of tile composables" into main