Merge "Add support for swiping back to the shortcut that launched the activity" into sc-dev