Merge "Make animation notifications thread safe." into main