am 447c677e: (-s ours) am 1139b326: Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread

Merge commit '447c677e97e90344881371ecef1ec8aca1b3acc0'

* commit '447c677e97e90344881371ecef1ec8aca1b3acc0':
  DO NOT MERGE Tweaked EdgeGlow to better match user expectations.