Merge "Finish fixed rotation while the task has done transition" into rvc-dev