Merge "Fix behavior of custom animations for LayoutTransition."