Merge "Correct a trace in cleanupPostRender"