Merge "Fix onHardwarePreDraw call in ThreadedRenderer"