Merge "Remove TaskInfo#topActivityToken usage in size compat for security" into sc-dev