Merge "SurfaceView: Check ViewRootImpl non-null" into rvc-dev