Merge "Take task snapshot on exiting PiP" into main