am 97f58a51: Merge "Polish display and evaluate animation" into mnc-dev

* commit '97f58a51b399a591122c96bf0b2e9ba4afb5602a':
  Polish display and evaluate animation