Merge "Rename closeDialog to cleanupSession"