Merge "Fix bug in LayoutTransition that caused views to stay invisible"