Merge "Add a view type check to ensure the right animation is used." into udc-dev