Merge "Fix area rendered by ScrollCaptureViewSupport"