Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1