Persists LocusId for Shortcuts.

Fixes: 128855592
Test: manual verification
Change-Id: I4219a983d04c984db50fc4c22420404947990e17
2 files changed