Merge "Add old lockAnimationClock(long) back" into main