Port: Wake on plug (2/2)

Change-Id: Icdacf8b186d893c2a107d9d61aa5439d777f4523

Conflicts:
	res/xml/display_settings.xml