Merge "Save calling package when ClipData is set to improve toast attribution." into sc-dev