Merge "Fix returning activity that not in the task" into rvc-dev