Merge "Only use the pre-animation bounds when an animation is running and is set" into pi-dev am: 5d4678e992
am: c218182fcd

Change-Id: Ic708d9f7c884540df477e6740e021496443ff108