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

* commit '2919f8dc000bd3c369a3c8d5a44ad21398b33a92':
  Polish display and evaluate animation