Merge "Improve QrCodeGenerator.encodeQrCode performance" into udc-qpr-dev