Merge "Always propagate userId to InputMethodMenuController" into main