Merge "Tweak EdgeEffect"