Merge "Replace client token with a new token in InputWindowHandle"