Merge "Fix a crash in skia pipeline, when empty reorder block is first"