Merge "Change the expected AP iface index when dual STAs supported." into tm-dev