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

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