Merge "MediaBrowser: Handle null results properly in onLoadChildren" into mnc-ub-dev
am: 11f682c457

* commit '11f682c4574b53ba6113bb811f197eadde491eb7':
  MediaBrowser: Handle null results properly in onLoadChildren