Better glow repeat behavior

Change-Id: Ic6fa458ef95c47b4867a11bf280631f6ab05da7d