Merge "Optimize opposite driver modes migration test"