Merge "Address confusions around "subtypeId" in InputMethodSettings" into main