Include shape support for video and pointalism + some missing bits

The video and pointalism pipelines now take into account
entity geometry. Also includes some missing changes that
probably got lost during the merge with wip/rib/master-next