Merge "Post clean up starting window related data." into main