Commenting out some calls to remove working directory that might not be safe

Fixing logic used to populate measure list in LocalLibraryController
Restore app state on all paths that close the dialog