Merge "Fix ThreadedRenderer.setEnabled()"