Merge "Fix ImageTileSet support for multiple drawables" into sc-dev