Merge "Add shape animation test case"