Merge "Fix bug in EdgeEffect with glow" into sc-dev