Apply visibility values interface to workflow
Limit the number of visibility states returned
Restores import order in Workflow.
Merge branch 'feature/visibility-values' into release/2.3