Merge "Add TaskSnapshot reference when used for Content suggestion." into main