Merge "Add a fallback check to prevent half-way pip anims" into udc-dev