Merge "Attempting to fix the black flicker" into pi-dev