Merge "Fix wrong widget appearing in widget picker for tablet" into tm-qpr-dev

    public WidgetsListContentEntry getSelectedAppWidgets(PackageUserKey packageUserKey) {

        return (WidgetsListContentEntry) mAllWidgets.stream()

                .filter(row -> row instanceof WidgetsListContentEntry

                        && row.mPkgItem.packageName.equals(packageUserKey.mPackageName))

                        && PackageUserKey.fromPackageItemInfo(row.mPkgItem).equals(packageUserKey))

                .findAny()

                .orElse(null);

    }