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