Merge "Remove InputMethodManager.ImeThreadFactory, which is unused" into sc-dev