am ef4e5484: Merge "Disable animations if manually overriding.  DO NOT MERGE." into klp-dev

* commit 'ef4e54842509631607bb63afcc28bbf8dccab9db':
  Disable animations if manually overriding.  DO NOT MERGE.