Merge "Upgrade zxing to 3.5.2" into main