Merge "Adding optional block to run before screenshot" into udc-dev