Merge "Prevent ConfigPusher from killing its thread"