Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev