Merge "Improve IME dump formatting and spacing" into main