Merge "Block animation transfer after surface animation finishes."