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

Change-Id: I807ee9c4357876d691d3791815f14265984cea6b