Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread