Merge "Remove moot synchronization on shutdown"