DO NOT MERGE Adjust amount pull effects the glow and edge decay.

Edge decay is now based on the remaining height of the glow so that
as the glow reduces, the edge will reduce and not disappear entirely
before the glow is gone.

Change-Id: I03376ee3807e21ce6ac74c0cfad713b7fd5e4520