Merge "Fix ActivityRecord leak if mainWindow is animating." into sc-dev