Merge "Moving ViewCaptureRule to inside of FailureWatcher" into udc-qpr-dev