Merge "Kill apps when GIDs changed instead of only when added" into main