Merge "Fix pre sdk-18 compatibility (crash in dispatchDraw)" into ub-now-mister-ugly