Merge "Fix: Context menu can contain obsolete suggestions." into nyc-dev am: 13d66d8456
am: f6c1149985

* commit 'f6c1149985b6dff5c17af1d8b4eb7a0da3257456':
  Fix: Context menu can contain obsolete suggestions.