Merge "Capture real snapshot of task for non cache case" into main