Merge "Move performSurfacePlacement after tryStartExitingAnimation"