Merge "Fix NullPointerException on ThreadedRenderer" into sc-dev