Fixed context menu position
Merge remote-tracking branch 'upstream/pr/11499' into pr/11499

* upstream/pr/11499:
  Fixed context menu position
Add changelog entry
Merge branch 'pr/11499' into develop