Merge "Catch IllegalArgumentException from PackageManager in InputMethodUtils" into tm-dev