Merge "Keep old callback thread"