Merge "Only execute relayout after animation is over"