Merge "Fix crashing dispatchDraw test" into lmp-dev