Merge "Clear LastSurfacePosition when surface is cleared."