Merge "Fix animation and layoutTransition issues."