Merge "Revert "Keep ViewCaptureRule logic self-contained."" into udc-dev