Merge "Add a different Wi-Fi Easy Connect entry point"