Merge "Make underlying SurfaceView respect visibility of InlineContentView." into rvc-dev