Merge "Release SurfaceView surface if viewrootimpl surface is not valid" into rvc-dev