Revert "fixed activity id persistence on reload"

This reverts commit 85d3ed70bff2d55949d1ada4465399552ef2124a.
Revert "Revert "fixed activity id persistence on reload""

This reverts commit a37fe7c27f759c71af23d5b31b445613373575b5.
Revert "Revert "Revert "fixed activity id persistence on reload"""

This reverts commit 2b5e4ee2f1826cebfd3e88483dc73e4ccb9e6bfd.