Merge "Keep compatibility for old WiFi shortcut"