Merge "Allow SurfaceView's Surface to be preserved on visibility changes"