Merge "Sync up state with supplicant at start"