Merge "Make "ime reset --user <userId>" consistent among users" into main