Merge "Correct the return value of applyAnimationLocked."