Resolve "Improve logout and ensure we don't leak logged in state after logout"

Merged Agate requested to merge 124-logout into develop

Merge request reports