Merge "Skip test_container_synchronization"