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