Merge "Only use the pre-animation bounds when an animation is running and is set" into pi-dev