Merge "MediaBrowser: Make support lib work properly"