Merge "Fix wifi QR decorator not rendering" into udc-dev