Merge "Forced to max one offsetAnimationJob in progress" into main