Merge "MediaBrowser: Minor fixes"