Move the margin animation-cancelling call into the margins-pinned check block in LayerMarginsAnimator to make sure margin animations aren't cancelled by scrolling when margins are locked.
