Merge "Fix ImeSubtypeListItem#compareTo()"