Merge "Fix animating between very different heights" into mnc-dev