Merge "[Wi-Fi] Prevent fatal exception for null intent action"