Merge "Correct the return value of applyAnimationLocked." into rvc-d1-dev