STREAM-277 UI pop-up hell when pion shuts down - Code Review comment