Merge "Fix the accessibility class name of tiles" into main