Merge "Fix fading edge effect from impacting neighboring pixels"