Merge "Fix new lightreveal transition" into udc-qpr-dev