s4-common: turn screen on when unplugging

Change-Id: Id2aa374aa12dd3c49addcde73113bc4913de2f3e
s4-common: remove unused entries

Change-Id: If1d7b050e23ccbc42415e89763ecb22c301cfad1