Merge "Centralize assignment of pip enter animation type" into udc-dev