Store current activity in state config

Nicolas Fellarequested to merge
work/nico/state-current into master

It's subject to frequent change

Merge request reports