Merge "Correctly resume profileRendering"