Merge "Minor tweaks to MediaBrowser" into lmp-dev