Merge "MediaBrowser: Add a disconnecting state"