Merge "Fix crash with LayoutTransition and ViewOverlay collision"