am 545fdfe1: Merge "Minor tweaks to MediaBrowser" into lmp-dev

* commit '545fdfe1a7d215054b16ee83cf050b4ac22e779a':
  Minor tweaks to MediaBrowser