Merge "WindowStateAnimator: Remove mSurfaceResized"