Merge "Ensure no resumed activity while staring one in the same TF" into main