Merge "Only set spring end value if animation wasn't canceled" into ub-launcher3-rvc-dev am: 62b8c1a5f9

Change-Id: I7058982b28d80e17827b7d0acdaec0e8823988a8