Merge "skip test_stack_update_add_remove because of race"