Merge "Add a flag to adjust the QR code margin" into main