Merge "Add traces when windows are animating"