Merge "Fix that WindowContext token is always null"