Improve fragment resume handling