am e7955865: am d2e1e447: Merge "Use same default duration (300) for animator resources as for other animators" into jb-mr2-dev

* commit 'e7955865a17e3065bcaf56fa57bec0346ecc8d21':
  Use same default duration (300) for animator resources as for other animators