Fix dialogue screen connections to repaint when states are sorted
Merge branch 'develop-frontend' into feature/issue-457-dialogue-screen-connections-dont-repaint-when-states-are-being-sorted