Organize type selection at context content block

Show main types first and render a link to display more types at context content block edition
Merge branch 'ActionItem2888' into stable