Merge "Fix padding issue on Scan QR code screen" into udc-dev