Display context name in combo box
Display context name in combo box

* origin/pr/12044:
  Display context name in combo box