Bug fix: glow flickers after a fadeout animation

Change-Id: I26811b8cd37b0bfefbd5b971844e2c2a1c3b84e4