Merge "Crash during Task switch" into main