Merge "Adds a cancel button to ShortcutActivity dialog"