Fix remove and update from window context settings
Fix context settings remove and update from window

* origin/pr/12099:
  Fix remove and update from window context settings
Fix context settings remove and update from window

* origin/master:
  Fix remove and update from window context settings