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

* commit '2a4d19b1260b2a39a174c331288184d603a8f0ee':
  Minor tweaks to MediaBrowser