Merge "Do not remove snapshot after task enters PiP" into main