Merge "Remove WindowContext, use window binder token"