Merge "Always look for display-specific IME." into main