Merge "Fix Wi-Fi QR code scanner height at 360dp" into qt-dev