Merge "Eliminating aliasing vertical lines." into ics-mr0