Merge "Update layer of rotation leash when restoring pip to original task" into main