Merge branch 'tristan/backport-update-state-changes-1.2' into 'bst-1.2'

Tristan/backport update state changes 1.2

See merge request BuildStream/buildstream!1256