Merge "Saving view capture data before cleaning it in ViewCaptureRule" into udc-qpr-dev