Merge "MediaBrowser: Allow to connect while disconnecting" into oc-dev