Merge "Explicitly pass userId to getWindowToken"