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