Merge "Fix 3502257: Fix glow calculation in EdgeGlow"