Merge "Check window token when extending timeout"