Merge "Update active time to visible leaf tasks" into tm-dev