Merge "SurfaceFlinger: Avoid entering resize-pending state when we don't have a buffer."