Merge "Don't set the session name in CLI or when sessions are deactivated"