Merge "Dont create a dummy animation for a transferred animation" into mnc-dev