Merge "Set the unpack alignment before uploading a texture." into gingerbread