In file-psd, fix the creation of the "merged" image data, saved in PSD files along with the actual layer data. (cherry picked from commit 8a01866a)