Merge "Fix NPE in InputMethodManagerService#resetDefaultImeLocked" into main