Merge "Prevent crash when manipulating hidden SurfaceView."