Merge "Fix HEIF support"