Merge "Selectively redact XMP data" into qt-dev