Merge "Added LocusId support to Shortcut and Notification."