Merge "Fix light reveal state" into udc-qpr-dev