Merge "Recover from buffer stuffing for canned animations" into main