Merge "Remove old workaround for display issues" into pi-dev am: a43de8b61a
am: 40b24d6a98

Change-Id: Iacf0ad45c6ece65f6e9c37b97612f1e205ebde45