Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev