Merge "Create location  to store surface and window trace files on init"