Merge "Fix some animation janks during code start."