Merge "Fix crashes in setMatrix() and concat()"