Move focus point computation to the renderer
Merge branch 'master' into 29-query-facelift
Merge branch '29-query-facelift' into next