sxiv: Merge upstream changes