COMP: temporary fix by reordering test calls
Merge branch 'bug-18240-PaintBrushToolStatemachineCorrections'