Merge "Simplify edit tile list state" into main