Merge "Remove unused preview arguments (2/3)" into udc-qpr-dev