Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev