Merge "Polish display and evaluate animation" into mnc-dev