Merge changes from topic "lock_free_win"

* changes:
  Fix minor issues with new window animations.
  Fix possible race conditions when cancelling animations
  Lock free animations (2/2)