Back to display-g2

H/W playback refuses to work without it

Change-Id: If4ebda1295d3f00d439ec720763e0c2226b3173e