Merge "Also allow avoiding gfx acceleration at runtime" into pi-dev