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

Change-Id: Ifaad73b221c8c1745245203fc26e38b2a9d00884