Merge "Allow Shortcuts to be started on ActivityView"