Improve single connection/disconnection flow when multiple apps are presented

When several apps are displayed in the Discover/Connection Control, the behavior is inconsistent. It should be possible to jump from one app to another, closing them and cleaning up after them if desired. Currently, that's not the case.