am 36eefaf3: am ef4e5484: Merge "Disable animations if manually overriding. ...
am 36eefaf3: am ef4e5484: Merge "Disable animations if manually overriding. DO NOT MERGE." into klp-dev
* commit '36eefaf3':
Disable animations if manually overriding. DO NOT MERGE.