Merge "Correct cross-task animation target for shell transition." into main