Merge "Refactor IME callback registration" into main