Merge "MediaBrowser: Copy options before calling subscribeInternal()" into nyc-dev