Merge "Fix null offscreen buffer crash"