Merge "Revert "Instantiate InputMethodManager for each display""