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

Change-Id: Ifebe6be3f86ae614c4d48b7a6d84ec9dbfded9ac