am df181185: Merge "Hide TYPE_CHOICE_LEVEL since there\'s no visual representation for it yet." into jb-mr2-dev

* commit 'df18118529eecf7f9bd821552015fea5182c8840':
  Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.