App and page state now works with handlers after tombstone.
Merge branch 'JP'