Merge "Remove old workaround for display issues" into pi-dev