Merge "Reland "Update data types to support cross user suspension"" into main