Merge "Improve UX of Wi-Fi QR code scanner enrollee flow"