Merge "Fix GCH preview not working w/ minigbm"