Refactoring.
Started implementing search result state.
Merge branch 'master' into JP
App state handling after tombstoning is working now.
Refactoring.
Merge branch 'JP'