Merge "Revert "Activate flag for Light Reveal Effect"" into udc-dev