Merge "WiFi: only send engine setting when key_id is set" into jb-dev