Merge "Fix domain selection while in ECBM on WLAN" into main