Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev