Merge "MediaBrowser: Copy options before using it in subscribe()" into nyc-dev