Merge "Fix processing effect uuid null" into udc-qpr-dev