Merge "Camera2: Do not throw exception if addSurface size doesn't match"