Merge "Fix CTS test failure with hierarchical animation enabled."