Merge "Improvements to IME viewers." into main