Support multiple shortcuts per trigger

Change-Id: I59a10957f5aba05eb45fe00f6d4c9c5854a0a7b8
Merge "Support multiple shortcuts per trigger"