Merge "Avoid sending two onSurfaceDestroyed() events" into main