Merge "Add graceful shutdown for Session Manager"