Merge "Fix multiple PersistentActivity parsing" into main