Merge "Let token animation notify removing starting window" into main