LPS-37920 Final fix for incorrect scanline stride issue