Merge "Simplify ImeTargetChangeListener impl a bit" into main