Merge "Adds locus Id to ShortcutQuery to find shortcuts based on LocusId"