Merge "Wait for interface to detach for all interface tests"