Merge "Input method codehealth small enhancements" into main