Merge "Make PlaylistBrowserActivity handle missing playlist extras."