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