am aa60232b: am 8518c090: Merge "Fix animation on the some properties" into lmp-dev

* commit 'aa60232b96ace3ab176611c170e950a7b6db5481':
  Fix animation on the some properties