Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev