Merge "wifi: fix incorrect active wlan iface in bridged mode"