Merge "Add tests for captive/partial after roam and ignore roam failures"