Merge "Fix fading edge effect from impacting neighboring pixels" into qt-dev
am: 9fdd35e9aa

Change-Id: Ia759b9218ee6dbb6b6fa4aea69526de0d7facd84