Merge "MediaBrowser: Allow to connect while disconnecting" into oc-dev am: 69c81d8cef
am: 15cbcc866b

Change-Id: I3b75ab0c160f63d4a77d36bcd27b03c4014fbd90