Merge "Apply timeout of one-shot pip animation type for shell transition" into udc-dev