Merge "Fix regression where ShortcutRequest returns no results" into ub-launcher3-master