Bug fix on Timer Activity  state saving
more conflicts