Merge "Fix flickering when switching display power modes" into pi-dev