Merge "Fix the visibility of SurfaceView in InlineContentView." into rvc-dev