Merge "Remove persisted stacks when app removed/cleared." into klp-dev