DDF-654: Activities only persist w/ constant state